aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2012-05-04 20:33:48 +0200
committerMelanie2012-05-04 20:33:48 +0200
commit333d013b5c34d7ed8c016251e50b80b62500aa3f (patch)
treeaa65eb2c104d257cedda579194bcaf6ebde97719 /OpenSim/Framework
parentReverse the order of physics event unsubscription to allow GC. Adapted from U... (diff)
downloadopensim-SC_OLD-333d013b5c34d7ed8c016251e50b80b62500aa3f.zip
opensim-SC_OLD-333d013b5c34d7ed8c016251e50b80b62500aa3f.tar.gz
opensim-SC_OLD-333d013b5c34d7ed8c016251e50b80b62500aa3f.tar.bz2
opensim-SC_OLD-333d013b5c34d7ed8c016251e50b80b62500aa3f.tar.xz
Add the default animation to the child agent data update
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index abff44a..7962ff4 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -311,6 +311,7 @@ namespace OpenSim.Framework
311 311
312 public AgentGroupData[] Groups; 312 public AgentGroupData[] Groups;
313 public Animation[] Anims; 313 public Animation[] Anims;
314 public Animation DefaultAnim = null;
314 315
315 public UUID GranterID; 316 public UUID GranterID;
316 public UUID ParentPart; 317 public UUID ParentPart;
@@ -397,6 +398,11 @@ namespace OpenSim.Framework
397 args["animations"] = anims; 398 args["animations"] = anims;
398 } 399 }
399 400
401 if (DefaultAnim != null)
402 {
403 args["default_animation"] = DefaultAnim.PackUpdateMessage();
404 }
405
400 if (Appearance != null) 406 if (Appearance != null)
401 args["packed_appearance"] = Appearance.Pack(); 407 args["packed_appearance"] = Appearance.Pack();
402 408
@@ -594,6 +600,11 @@ namespace OpenSim.Framework
594 } 600 }
595 } 601 }
596 602
603 if (args["default_animation"] != null)
604 {
605 DefaultAnim = new Animation((OSDMap)args["default_animation"]);
606 }
607
597 //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array) 608 //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
598 //{ 609 //{
599 // OSDArray textures = (OSDArray)(args["agent_textures"]); 610 // OSDArray textures = (OSDArray)(args["agent_textures"]);