diff options
author | UbitUmarov | 2014-10-17 14:07:11 +0100 |
---|---|---|
committer | UbitUmarov | 2014-10-17 14:07:11 +0100 |
commit | 2bea66ed27d86ddd7f34ee1e7d0292ae4f1c5644 (patch) | |
tree | 41fccb44944dd67bd3aa31a251ebfc6f7929c840 /OpenSim/Framework | |
parent | send correct caps seed on CreateAgent to a nearby region (diff) | |
download | opensim-SC_OLD-2bea66ed27d86ddd7f34ee1e7d0292ae4f1c5644.zip opensim-SC_OLD-2bea66ed27d86ddd7f34ee1e7d0292ae4f1c5644.tar.gz opensim-SC_OLD-2bea66ed27d86ddd7f34ee1e7d0292ae4f1c5644.tar.bz2 opensim-SC_OLD-2bea66ed27d86ddd7f34ee1e7d0292ae4f1c5644.tar.xz |
send motion control state in update to childs. Reset CollisionPlane on
makechild
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 538e1b5..5078f69 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -320,6 +320,7 @@ namespace OpenSim.Framework | |||
320 | public Animation[] Anims; | 320 | public Animation[] Anims; |
321 | public Animation DefaultAnim = null; | 321 | public Animation DefaultAnim = null; |
322 | public Animation AnimState = null; | 322 | public Animation AnimState = null; |
323 | public Byte MotionState = 0; | ||
323 | 324 | ||
324 | public UUID GranterID; | 325 | public UUID GranterID; |
325 | public UUID ParentPart; | 326 | public UUID ParentPart; |
@@ -434,6 +435,11 @@ namespace OpenSim.Framework | |||
434 | args["movementAO"] = AOs; | 435 | args["movementAO"] = AOs; |
435 | } | 436 | } |
436 | 437 | ||
438 | if (MotionState != 0) | ||
439 | { | ||
440 | args["motion_state"] = OSD.FromInteger(MotionState); | ||
441 | } | ||
442 | |||
437 | if (Appearance != null) | 443 | if (Appearance != null) |
438 | args["packed_appearance"] = Appearance.Pack(); | 444 | args["packed_appearance"] = Appearance.Pack(); |
439 | 445 | ||
@@ -676,6 +682,9 @@ namespace OpenSim.Framework | |||
676 | } | 682 | } |
677 | } | 683 | } |
678 | 684 | ||
685 | if (args.ContainsKey("motion_state")) | ||
686 | MotionState = (byte)args["motion_state"].AsInteger(); | ||
687 | |||
679 | //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array) | 688 | //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array) |
680 | //{ | 689 | //{ |
681 | // OSDArray textures = (OSDArray)(args["agent_textures"]); | 690 | // OSDArray textures = (OSDArray)(args["agent_textures"]); |