From 608690c748cdb3a52c7e180d28ad9ca3d4e06129 Mon Sep 17 00:00:00 2001
From: Madpeter <57852827+Madpeterz@users.noreply.github.com>
Date: Fri, 2 Dec 2022 20:08:39 +0000
Subject: [PATCH] wip

---
 .../LibreMetaverse.StructuredData.csproj                  | 4 ++--
 LibreMetaverse.Types/LibreMetaverse.Types.csproj          | 4 ++--
 LibreMetaverse/InventoryManager.cs                        | 4 ++--
 LibreMetaverse/LibreMetaverse.csproj                      | 2 +-
 LibreMetaverse/ParcelManager.cs                           | 8 +++++++-
 LibreMetaverse/Settings.cs                                | 4 ++++
 SecondBotEvents/SecondBotEvents.csproj                    | 2 +-
 7 files changed, 19 insertions(+), 9 deletions(-)

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 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>LibreMetaverse.StructuredData</AssemblyName>
 	<Description>LibreMetaverse structured data library</Description>
 	<PackageId>LibreMetaverse.StructuredData</PackageId>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net48;netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse.StructuredData</RootNamespace>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
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 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>LibreMetaverse.Types</AssemblyName>
 	<PackageId>LibreMetaverse.Types</PackageId>
 	<Description>LibreMetaverse type library</Description>
-	  <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net48;netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>LibreMetaverse</RootNamespace>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
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 @@
 	<IncludeSymbols>true</IncludeSymbols>
 	<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	<NoWarn>0419,1574,1591</NoWarn>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net48;netstandard2.1;net6.0;net7.0</TargetFrameworks>
     <Platforms>x64;x86;AnyCPU</Platforms>
 	<OutputPath>..\bin\</OutputPath>
   </PropertyGroup>
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)
+        /// <summary>
+        /// Update the parcel (in the current sim)
+        /// </summary>
+        /// <param name="client">Client message originates from</param>
+        /// <param name="wantReply">Whether we want the simulator to confirm
+        /// the update with a reply packet or not [default false]</param>
+        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
         /// </summary>
+#if DEBUG
+        public static Helpers.LogLevel LOG_LEVEL = Helpers.LogLevel.Debug;
+#else
         public static Helpers.LogLevel LOG_LEVEL = Helpers.LogLevel.None;
+#endif
 
         /// <summary>Attach avatar names to log messages</summary>
         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 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <StartupObject>SecondBotEvents.Startup</StartupObject>
 	  <MSBuildGitHashCommand>git rev-parse --short HEAD</MSBuildGitHashCommand>
 	  <MSBuildGitHashValidate>False</MSBuildGitHashValidate>