From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.
---
.../Connectors/SimianGrid/SimianAvatarServiceConnector.cs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs')
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index a397740..34bb274 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -146,13 +146,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
userID,response["Message"].AsString());
return null;
}
-
+
//
//
//
public bool SetAppearance(UUID userID, AvatarAppearance appearance)
{
- OSDMap map = appearance.Pack();
+ EntityTransferContext ctx = new EntityTransferContext();
+ OSDMap map = appearance.Pack(ctx);
if (map == null)
{
m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR]: Failed to encode appearance for {0}",userID);
@@ -177,7 +178,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
return success;
}
-
+
//
//
//
@@ -218,7 +219,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
appearance.AvatarHeight = (float)map["Height"].AsReal();
AvatarData avatar = new AvatarData(appearance);
-
+
// Get attachments
map = null;
try { map = OSDParser.DeserializeJson(response["LLAttachments"].AsString()) as OSDMap; }
@@ -229,7 +230,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
foreach (KeyValuePair kvp in map)
avatar.Data[kvp.Key] = kvp.Value.AsString();
}
-
+
return avatar;
}
else
--
cgit v1.1