diff --git a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj index e86e489..4c70caa 100644 --- a/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj +++ b/LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj @@ -1,9 +1,9 @@ - + LibreMetaverse.StructuredData LibreMetaverse structured data library LibreMetaverse.StructuredData - netstandard2.1 + net48;netstandard2.1;net6.0;net7.0 Library LibreMetaverse.StructuredData true diff --git a/LibreMetaverse.Types/LibreMetaverse.Types.csproj b/LibreMetaverse.Types/LibreMetaverse.Types.csproj index df907bd..a78282b 100644 --- a/LibreMetaverse.Types/LibreMetaverse.Types.csproj +++ b/LibreMetaverse.Types/LibreMetaverse.Types.csproj @@ -1,9 +1,9 @@ - + LibreMetaverse.Types LibreMetaverse.Types LibreMetaverse type library - netstandard2.1 + net48;netstandard2.1;net6.0;net7.0 Library LibreMetaverse true diff --git a/LibreMetaverse/InventoryManager.cs b/LibreMetaverse/InventoryManager.cs index 2afc114..7113422 100644 --- a/LibreMetaverse/InventoryManager.cs +++ b/LibreMetaverse/InventoryManager.cs @@ -2160,11 +2160,11 @@ namespace OpenMetaverse public void RequestUploadNotecardAsset(byte[] data, UUID notecardID, InventoryUploadedAssetCallback callback) { if (Client.Network.CurrentSim == null || Client.Network.CurrentSim.Caps == null) - throw new Exception("UpdateNotecardAgentInventory capability is not currently available"); + throw new Exception("Capability system not initialized to send asset"); Uri cap = Client.Network.CurrentSim.Caps.CapabilityURI("UpdateNotecardAgentInventory"); - if (cap == null) + if (cap != null) { OSDMap query = new OSDMap { { "item_id", OSD.FromUUID(notecardID) } }; diff --git a/LibreMetaverse/LibreMetaverse.csproj b/LibreMetaverse/LibreMetaverse.csproj index 05e5dba..afe5cde 100644 --- a/LibreMetaverse/LibreMetaverse.csproj +++ b/LibreMetaverse/LibreMetaverse.csproj @@ -11,7 +11,7 @@ true snupkg 0419,1574,1591 - netstandard2.1 + net48;netstandard2.1;net6.0;net7.0 x64;x86;AnyCPU ..\bin\ diff --git a/LibreMetaverse/ParcelManager.cs b/LibreMetaverse/ParcelManager.cs index 9f645fc..d6f064f 100644 --- a/LibreMetaverse/ParcelManager.cs +++ b/LibreMetaverse/ParcelManager.cs @@ -606,7 +606,13 @@ namespace OpenMetaverse Media = new ParcelMedia(); } - public void Update(GridClient client, bool wantReply=false) + /// + /// Update the parcel (in the current sim) + /// + /// Client message originates from + /// Whether we want the simulator to confirm + /// the update with a reply packet or not [default false] + public void Update(GridClient client, bool wantReply = false) { Update(client, client.Network.CurrentSim, wantReply); } diff --git a/LibreMetaverse/Settings.cs b/LibreMetaverse/Settings.cs index e081410..aec56ab 100644 --- a/LibreMetaverse/Settings.cs +++ b/LibreMetaverse/Settings.cs @@ -342,7 +342,11 @@ namespace OpenMetaverse /// You will get no output on the console. This behavior can be overriden by creating /// a logger configuration file for log4net /// +#if DEBUG + public static Helpers.LogLevel LOG_LEVEL = Helpers.LogLevel.Debug; +#else public static Helpers.LogLevel LOG_LEVEL = Helpers.LogLevel.None; +#endif /// Attach avatar names to log messages public bool LOG_NAMES = true; diff --git a/SecondBotEvents/SecondBotEvents.csproj b/SecondBotEvents/SecondBotEvents.csproj index 9175ab6..2033c41 100644 --- a/SecondBotEvents/SecondBotEvents.csproj +++ b/SecondBotEvents/SecondBotEvents.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 SecondBotEvents.Startup git rev-parse --short HEAD False