aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs11
1 files changed, 6 insertions, 5 deletions
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
146 userID,response["Message"].AsString()); 146 userID,response["Message"].AsString());
147 return null; 147 return null;
148 } 148 }
149 149
150 // <summary> 150 // <summary>
151 // </summary> 151 // </summary>
152 // <param name=""></param> 152 // <param name=""></param>
153 public bool SetAppearance(UUID userID, AvatarAppearance appearance) 153 public bool SetAppearance(UUID userID, AvatarAppearance appearance)
154 { 154 {
155 OSDMap map = appearance.Pack(); 155 EntityTransferContext ctx = new EntityTransferContext();
156 OSDMap map = appearance.Pack(ctx);
156 if (map == null) 157 if (map == null)
157 { 158 {
158 m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR]: Failed to encode appearance for {0}",userID); 159 m_log.WarnFormat("[SIMIAN AVATAR CONNECTOR]: Failed to encode appearance for {0}",userID);
@@ -177,7 +178,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
177 178
178 return success; 179 return success;
179 } 180 }
180 181
181 // <summary> 182 // <summary>
182 // </summary> 183 // </summary>
183 // <param name=""></param> 184 // <param name=""></param>
@@ -218,7 +219,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
218 appearance.AvatarHeight = (float)map["Height"].AsReal(); 219 appearance.AvatarHeight = (float)map["Height"].AsReal();
219 220
220 AvatarData avatar = new AvatarData(appearance); 221 AvatarData avatar = new AvatarData(appearance);
221 222
222 // Get attachments 223 // Get attachments
223 map = null; 224 map = null;
224 try { map = OSDParser.DeserializeJson(response["LLAttachments"].AsString()) as OSDMap; } 225 try { map = OSDParser.DeserializeJson(response["LLAttachments"].AsString()) as OSDMap; }
@@ -229,7 +230,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
229 foreach (KeyValuePair<string, OSD> kvp in map) 230 foreach (KeyValuePair<string, OSD> kvp in map)
230 avatar.Data[kvp.Key] = kvp.Value.AsString(); 231 avatar.Data[kvp.Key] = kvp.Value.AsString();
231 } 232 }
232 233
233 return avatar; 234 return avatar;
234 } 235 }
235 else 236 else