diff options
author | Sean Dague | 2007-11-20 21:25:27 +0000 |
---|---|---|
committer | Sean Dague | 2007-11-20 21:25:27 +0000 |
commit | 7b09800d5b36871d35ae80f67ec28f89c86dece8 (patch) | |
tree | 9946a73e8538f70c4764ccc2f618d9f3afde6e26 /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | patch for llDie from Kurt Taylor (IBM) (diff) | |
download | opensim-SC-7b09800d5b36871d35ae80f67ec28f89c86dece8.zip opensim-SC-7b09800d5b36871d35ae80f67ec28f89c86dece8.tar.gz opensim-SC-7b09800d5b36871d35ae80f67ec28f89c86dece8.tar.bz2 opensim-SC-7b09800d5b36871d35ae80f67ec28f89c86dece8.tar.xz |
fix for mantis #2 from Justin Casey (IBM)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 7927de6..ea8d5c4 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -526,7 +526,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
526 | if ((flags & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) | 526 | if ((flags & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) |
527 | { | 527 | { |
528 | StandUp(); | 528 | StandUp(); |
529 | UpdateMovementAnimations(true); | ||
530 | } | 529 | } |
531 | 530 | ||
532 | if (PhysicsActor == null) | 531 | if (PhysicsActor == null) |
@@ -593,7 +592,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
593 | 592 | ||
594 | } | 593 | } |
595 | 594 | ||
596 | protected void StandUp() | 595 | /// <summary> |
596 | /// Perform the logic necessary to stand the client up. This method also executes | ||
597 | /// the stand animation. | ||
598 | /// </summary> | ||
599 | public void StandUp() | ||
597 | { | 600 | { |
598 | if (m_parentID != 0) | 601 | if (m_parentID != 0) |
599 | { | 602 | { |
@@ -607,6 +610,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
607 | m_parentID = 0; | 610 | m_parentID = 0; |
608 | SendFullUpdateToAllClients(); | 611 | SendFullUpdateToAllClients(); |
609 | } | 612 | } |
613 | |||
614 | UpdateMovementAnimations(true); | ||
610 | } | 615 | } |
611 | 616 | ||
612 | private void SendSitResponse(IClientAPI remoteClient, LLUUID targetID, LLVector3 offset) | 617 | private void SendSitResponse(IClientAPI remoteClient, LLUUID targetID, LLVector3 offset) |
@@ -651,7 +656,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
651 | if (m_parentID != 0) | 656 | if (m_parentID != 0) |
652 | { | 657 | { |
653 | StandUp(); | 658 | StandUp(); |
654 | UpdateMovementAnimations(true); | ||
655 | } | 659 | } |
656 | 660 | ||
657 | SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); | 661 | SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); |