Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/HttpRewrite

Browse Source
This commit is contained in:
cinder
2022-08-28 16:31:02 -05:00
parent 03e0ec8fd7 7b26ee30f7
commit 7abece613d
6 changed files with 1111 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LibreMetaverse.Tests/LibreMetaverse.Tests.csproj
View File

@@ -38,9 +38,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.15.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

1051
LibreMetaverse.Types/MultiValueDictionary.cs Normal file
View File

File diff suppressed because it is too large Load Diff

108
LibreMetaverse/AgentManager.cs
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006-2016, openmetaverse.co
* Copyright (c) 2006-2016, openmetaverse.co
* Copyright (c) 2019-2022, Sjofn LLC
* All rights reserved.
*
@@ -3291,27 +3291,27 @@ namespace OpenMetaverse
Client.Network.SendPacket(aiup);
}
/// <summary>
/// Update agent's private notes for target avatar
/// </summary>
/// <param name="target">target avatar for notes</param>
/// <summary>
/// Update agent's private notes for target avatar
/// </summary>
/// <param name="target">target avatar for notes</param>
/// <param name="notes">notes to store</param>
public void UpdateProfileNotes(UUID target, string notes)
{
AvatarNotesUpdatePacket anup = new AvatarNotesUpdatePacket
{
AgentData =
{
AgentID = AgentID,
SessionID = SessionID
},
Data =
{
TargetID = target,
Notes = Utils.StringToBytes(notes)
}
};
Client.Network.SendPacket(anup);
public void UpdateProfileNotes(UUID target, string notes)
{
AvatarNotesUpdatePacket anup = new AvatarNotesUpdatePacket
{
AgentData =
{
AgentID = AgentID,
SessionID = SessionID
},
Data =
{
TargetID = target,
Notes = Utils.StringToBytes(notes)
}
};
Client.Network.SendPacket(anup);
}
/// <summary>
@@ -3842,9 +3842,9 @@ namespace OpenMetaverse
}
};
OSDMap req = new OSDMap
{
["access_prefs"] = new OSDMap { ["max"] = access }
OSDMap req = new OSDMap
{
["access_prefs"] = new OSDMap { ["max"] = access }
};
request.PostRequestAsync(req, OSDFormat.Xml, Client.Settings.CAPS_TIMEOUT);
@@ -3940,12 +3940,12 @@ namespace OpenMetaverse
if (m_InstantMessage == null) return; // don't bother if we don't have any listeners
if (!(response is OSDMap respMap) || respMap.Count == 0 || respMap.ContainsKey("messages"))
{
Logger.Log("Failed to retrieve offline messages because the capability returned some goofy shit.",
Helpers.LogLevel.Warning);
RetrieveInstantMessagesLegacy();
return;
if (!(response is OSDMap respMap) || respMap.Count == 0 || respMap.ContainsKey("messages"))
{
Logger.Log("Failed to retrieve offline messages because the capability returned some goofy shit.",
Helpers.LogLevel.Warning);
RetrieveInstantMessagesLegacy();
return;
}
if (respMap["messages"] is OSDArray msgArray)
@@ -3968,8 +3968,8 @@ namespace OpenMetaverse
: InstantMessageOnline.Offline;
message.ParentEstateID = msg.ContainsKey("parent_estate_id")
? msg["parent_estate_id"].AsUInteger() : 1;
message.Position = msg.ContainsKey("position")
? msg["position"].AsVector3()
message.Position = msg.ContainsKey("position")
? msg["position"].AsVector3()
: new Vector3(msg["local_x"], msg["local_y"], msg["local_z"]);
message.BinaryBucket = msg.ContainsKey("binary_bucket")
? msg["binary_bucket"].AsBinary() : new byte[] { 0 };
@@ -4776,17 +4776,17 @@ namespace OpenMetaverse
string message = Utils.BytesToString(alert.AlertData.Message);
if (alert.AlertInfo.Length > 0)
{
string notificationid = Utils.BytesToString(alert.AlertInfo[0].Message);
OSDMap extra = (alert.AlertInfo[0].ExtraParams != null && alert.AlertInfo[0].ExtraParams.Length > 0)
? OSDParser.Deserialize(alert.AlertInfo[0].ExtraParams) as OSDMap
: null;
OnAlertMessage(new AlertMessageEventArgs(message, notificationid, extra));
}
else
{
OnAlertMessage(new AlertMessageEventArgs(message, null, null));
if (alert.AlertInfo.Length > 0)
{
string notificationid = Utils.BytesToString(alert.AlertInfo[0].Message);
OSDMap extra = (alert.AlertInfo[0].ExtraParams != null && alert.AlertInfo[0].ExtraParams.Length > 0)
? OSDParser.Deserialize(alert.AlertInfo[0].ExtraParams) as OSDMap
: null;
OnAlertMessage(new AlertMessageEventArgs(message, notificationid, extra));
}
else
{
OnAlertMessage(new AlertMessageEventArgs(message, null, null));
}
}
@@ -5167,7 +5167,7 @@ namespace OpenMetaverse
/// <summary>Get the InstantMessage object</summary>
public InstantMessage IM { get; }
/// <summary>Get the simulator where the InstantMessage origniated</summary>
/// <summary>Get the simulator where the InstantMessage origniated</summary>
public Simulator Simulator { get; }
/// <summary>
@@ -5420,17 +5420,17 @@ namespace OpenMetaverse
public string NotificationId { get; }
public OSDMap ExtraParams { get; }
/// <summary>
/// Construct a new instance of the AlertMessageEventArgs class
/// </summary>
/// <param name="message">user readable message</param>
/// <param name="notificationid">notification id for alert, may be null</param>
/// <summary>
/// Construct a new instance of the AlertMessageEventArgs class
/// </summary>
/// <param name="message">user readable message</param>
/// <param name="notificationid">notification id for alert, may be null</param>
/// <param name="extraparams">any extra params in OSD format, may be null</param>
public AlertMessageEventArgs(string message, string notificationid, OSDMap extraparams)
{
Message = message;
NotificationId = notificationid;
ExtraParams = extraparams;
public AlertMessageEventArgs(string message, string notificationid, OSDMap extraparams)
{
Message = message;
NotificationId = notificationid;
ExtraParams = extraparams;
}
}

2
LibreMetaverse/AppearanceManager.cs
View File

@@ -30,12 +30,12 @@ using System.Collections.Generic;
using System.Threading;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Collections.Extensions;
using OpenMetaverse.Packets;
using OpenMetaverse.Imaging;
using OpenMetaverse.Assets;
using OpenMetaverse.Http;
using OpenMetaverse.StructuredData;
using LibreMetaverse;
namespace OpenMetaverse
{

5
LibreMetaverse/LibreMetaverse.csproj
View File

@@ -43,9 +43,8 @@
<Optimize>True</Optimize>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.14" />
<PackageReference Include="Microsoft.Experimental.Collections" Version="1.0.6-e190117-3" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="6.0.4" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="6.0.8" />
<PackageReference Include="OggVorbisEncoder" Version="1.2.0" />
<PackageReference Include="OpenJpegDotNet-LMV" Version="2.4.0.5" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />

2
Programs/GridProxy/GridProxy.csproj
View File

@@ -11,7 +11,7 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="log4net" Version="2.0.14" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="XmlRpcCore" Version="3.1.2.77" />
</ItemGroup>
<ItemGroup>