aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ChildAgentDataUpdate.cs
diff options
context:
space:
mode:
authorDiva Canto2010-01-12 09:22:58 -0800
committerDiva Canto2010-01-12 09:22:58 -0800
commit66920a9047b54db947d02f252e17409b7fc32ef0 (patch)
tree8e5b34a510885183e400796616f224faceb4a142 /OpenSim/Framework/ChildAgentDataUpdate.cs
parentFixed a couple of bugs with Appearance. Appearance is all good now. (diff)
downloadopensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.zip
opensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.tar.gz
opensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.tar.bz2
opensim-SC_OLD-66920a9047b54db947d02f252e17409b7fc32ef0.tar.xz
Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.
Diffstat (limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index b6b7996..fee71f0 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -334,6 +334,7 @@ namespace OpenSim.Framework
334 args["left_axis"] = OSD.FromString(LeftAxis.ToString()); 334 args["left_axis"] = OSD.FromString(LeftAxis.ToString());
335 args["up_axis"] = OSD.FromString(UpAxis.ToString()); 335 args["up_axis"] = OSD.FromString(UpAxis.ToString());
336 336
337
337 args["changed_grid"] = OSD.FromBoolean(ChangedGrid); 338 args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
338 args["far"] = OSD.FromReal(Far); 339 args["far"] = OSD.FromReal(Far);
339 args["aspect"] = OSD.FromReal(Aspect); 340 args["aspect"] = OSD.FromReal(Aspect);
@@ -353,7 +354,7 @@ namespace OpenSim.Framework
353 args["agent_access"] = OSD.FromString(AgentAccess.ToString()); 354 args["agent_access"] = OSD.FromString(AgentAccess.ToString());
354 355
355 args["active_group_id"] = OSD.FromUUID(ActiveGroupID); 356 args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
356 357
357 if ((Groups != null) && (Groups.Length > 0)) 358 if ((Groups != null) && (Groups.Length > 0))
358 { 359 {
359 OSDArray groups = new OSDArray(Groups.Length); 360 OSDArray groups = new OSDArray(Groups.Length);
@@ -378,6 +379,7 @@ namespace OpenSim.Framework
378 // args["agent_textures"] = textures; 379 // args["agent_textures"] = textures;
379 //} 380 //}
380 381
382
381 if ((AgentTextures != null) && (AgentTextures.Length > 0)) 383 if ((AgentTextures != null) && (AgentTextures.Length > 0))
382 args["texture_entry"] = OSD.FromBinary(AgentTextures); 384 args["texture_entry"] = OSD.FromBinary(AgentTextures);
383 385
@@ -393,6 +395,7 @@ namespace OpenSim.Framework
393 args["wearables"] = wears; 395 args["wearables"] = wears;
394 } 396 }
395 397
398
396 if ((Attachments != null) && (Attachments.Length > 0)) 399 if ((Attachments != null) && (Attachments.Length > 0))
397 { 400 {
398 OSDArray attachs = new OSDArray(Attachments.Length); 401 OSDArray attachs = new OSDArray(Attachments.Length);
@@ -401,9 +404,11 @@ namespace OpenSim.Framework
401 args["attachments"] = attachs; 404 args["attachments"] = attachs;
402 } 405 }
403 406
407
404 if ((CallbackURI != null) && (!CallbackURI.Equals(""))) 408 if ((CallbackURI != null) && (!CallbackURI.Equals("")))
405 args["callback_uri"] = OSD.FromString(CallbackURI); 409 args["callback_uri"] = OSD.FromString(CallbackURI);
406 410
411
407 return args; 412 return args;
408 } 413 }
409 414