aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2012-10-30 21:45:39 +0100
committerMelanie2012-10-30 22:11:02 +0000
commit9e05067a4f029983a749c348259112a8a18432d1 (patch)
treef43adfda8443c4f6c4cfb88dedc8d09a54455129 /OpenSim/Framework
parentMake MeshAssetReceived private. (diff)
downloadopensim-SC-9e05067a4f029983a749c348259112a8a18432d1.zip
opensim-SC-9e05067a4f029983a749c348259112a8a18432d1.tar.gz
opensim-SC-9e05067a4f029983a749c348259112a8a18432d1.tar.bz2
opensim-SC-9e05067a4f029983a749c348259112a8a18432d1.tar.xz
Add AnimState to CADU
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs36
1 files changed, 36 insertions, 0 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 6d048f4..dfe60aa 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -306,6 +306,8 @@ namespace OpenSim.Framework
306 306
307 public AgentGroupData[] Groups; 307 public AgentGroupData[] Groups;
308 public Animation[] Anims; 308 public Animation[] Anims;
309 public Animation DefaultAnim = null;
310 public Animation AnimState = null;
309 311
310 public UUID GranterID; 312 public UUID GranterID;
311 313
@@ -390,6 +392,16 @@ namespace OpenSim.Framework
390 args["animations"] = anims; 392 args["animations"] = anims;
391 } 393 }
392 394
395 if (DefaultAnim != null)
396 {
397 args["default_animation"] = DefaultAnim.PackUpdateMessage();
398 }
399
400 if (AnimState != null)
401 {
402 args["animation_state"] = AnimState.PackUpdateMessage();
403 }
404
393 if (Appearance != null) 405 if (Appearance != null)
394 args["packed_appearance"] = Appearance.Pack(); 406 args["packed_appearance"] = Appearance.Pack();
395 407
@@ -583,6 +595,30 @@ namespace OpenSim.Framework
583 } 595 }
584 } 596 }
585 597
598 if (args["default_animation"] != null)
599 {
600 try
601 {
602 DefaultAnim = new Animation((OSDMap)args["default_animation"]);
603 }
604 catch
605 {
606 DefaultAnim = null;
607 }
608 }
609
610 if (args["animation_state"] != null)
611 {
612 try
613 {
614 AnimState = new Animation((OSDMap)args["animation_state"]);
615 }
616 catch
617 {
618 AnimState = null;
619 }
620 }
621
586 //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array) 622 //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
587 //{ 623 //{
588 // OSDArray textures = (OSDArray)(args["agent_textures"]); 624 // OSDArray textures = (OSDArray)(args["agent_textures"]);