rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wip

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
LibreMetaverse.StructuredData/LibreMetaverse.StructuredData.csproj
View file

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<AssemblyName>LibreMetaverse.StructuredData</AssemblyName> <AssemblyName>LibreMetaverse.StructuredData</AssemblyName>
<Description>LibreMetaverse structured data library</Description> <Description>LibreMetaverse structured data library</Description>
<PackageId>LibreMetaverse.StructuredData</PackageId> <PackageId>LibreMetaverse.StructuredData</PackageId>
<TargetFrameworks>netstandard2.1</TargetFrameworks> <TargetFrameworks>net48;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>LibreMetaverse.StructuredData</RootNamespace> <RootNamespace>LibreMetaverse.StructuredData</RootNamespace>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <GenerateAssemblyInfo>true</GenerateAssemblyInfo>

4
LibreMetaverse.Types/LibreMetaverse.Types.csproj
View file

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<AssemblyName>LibreMetaverse.Types</AssemblyName> <AssemblyName>LibreMetaverse.Types</AssemblyName>
<PackageId>LibreMetaverse.Types</PackageId> <PackageId>LibreMetaverse.Types</PackageId>
<Description>LibreMetaverse type library</Description> <Description>LibreMetaverse type library</Description>
<TargetFrameworks>netstandard2.1</TargetFrameworks> <TargetFrameworks>net48;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>LibreMetaverse</RootNamespace> <RootNamespace>LibreMetaverse</RootNamespace>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <GenerateAssemblyInfo>true</GenerateAssemblyInfo>

4
LibreMetaverse/InventoryManager.cs
View file

@ -2160,11 +2160,11 @@ namespace OpenMetaverse
public void RequestUploadNotecardAsset(byte[] data, UUID notecardID, InventoryUploadedAssetCallback callback) public void RequestUploadNotecardAsset(byte[] data, UUID notecardID, InventoryUploadedAssetCallback callback)
{ {
if (Client.Network.CurrentSim == null || Client.Network.CurrentSim.Caps == null) 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"); Uri cap = Client.Network.CurrentSim.Caps.CapabilityURI("UpdateNotecardAgentInventory");
if (cap == null) if (cap != null)
{ {
OSDMap query = new OSDMap { { "item_id", OSD.FromUUID(notecardID) } }; OSDMap query = new OSDMap { { "item_id", OSD.FromUUID(notecardID) } };

2
LibreMetaverse/LibreMetaverse.csproj
View file

@ -11,7 +11,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<NoWarn>0419,1574,1591</NoWarn> <NoWarn>0419,1574,1591</NoWarn>
<TargetFrameworks>netstandard2.1</TargetFrameworks> <TargetFrameworks>net48;netstandard2.1;net6.0;net7.0</TargetFrameworks>
<Platforms>x64;x86;AnyCPU</Platforms> <Platforms>x64;x86;AnyCPU</Platforms>
<OutputPath>..\bin\</OutputPath> <OutputPath>..\bin\</OutputPath>
</PropertyGroup> </PropertyGroup>

8
LibreMetaverse/ParcelManager.cs
View file

@ -606,7 +606,13 @@ namespace OpenMetaverse
Media = new ParcelMedia(); 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); Update(client, client.Network.CurrentSim, wantReply);
} }

4
LibreMetaverse/Settings.cs
View file

@ -342,7 +342,11 @@ namespace OpenMetaverse
/// You will get no output on the console. This behavior can be overriden by creating /// You will get no output on the console. This behavior can be overriden by creating
/// a logger configuration file for log4net /// a logger configuration file for log4net
/// </summary> /// </summary>
#if DEBUG
public static Helpers.LogLevel LOG_LEVEL = Helpers.LogLevel.Debug;
#else
public static Helpers.LogLevel LOG_LEVEL = Helpers.LogLevel.None; public static Helpers.LogLevel LOG_LEVEL = Helpers.LogLevel.None;
#endif
/// <summary>Attach avatar names to log messages</summary> /// <summary>Attach avatar names to log messages</summary>
public bool LOG_NAMES = true; public bool LOG_NAMES = true;

2
SecondBotEvents/SecondBotEvents.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<StartupObject>SecondBotEvents.Startup</StartupObject> <StartupObject>SecondBotEvents.Startup</StartupObject>
<MSBuildGitHashCommand>git rev-parse --short HEAD</MSBuildGitHashCommand> <MSBuildGitHashCommand>git rev-parse --short HEAD</MSBuildGitHashCommand>
<MSBuildGitHashValidate>False</MSBuildGitHashValidate> <MSBuildGitHashValidate>False</MSBuildGitHashValidate>