This commit is contained in:
Madpeter 2022-12-02 20:08:39 +00:00
parent 22cc7e8b88
commit 608690c748
7 changed files with 19 additions and 9 deletions

View file

@ -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>

View file

@ -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>

View file

@ -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) } };

View file

@ -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>

View file

@ -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);
}

View file

@ -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;

View file

@ -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>