diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 83bd3fb..1859cb1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2310,6 +2310,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2310 | AddToPhysicalScene(false); | 2310 | AddToPhysicalScene(false); |
2311 | 2311 | ||
2312 | Animator.TrySetMovementAnimation("STAND"); | 2312 | Animator.TrySetMovementAnimation("STAND"); |
2313 | TriggerScenePresenceUpdated(); | ||
2313 | } | 2314 | } |
2314 | 2315 | ||
2315 | private SceneObjectPart FindNextAvailableSitTarget(UUID targetID) | 2316 | private SceneObjectPart FindNextAvailableSitTarget(UUID targetID) |
@@ -2408,7 +2409,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2408 | ControllingClient.SendSitResponse( | 2409 | ControllingClient.SendSitResponse( |
2409 | part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); | 2410 | part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); |
2410 | 2411 | ||
2411 | m_requestedSitTargetUUID = targetID; | 2412 | m_requestedSitTargetUUID = part.UUID; |
2412 | 2413 | ||
2413 | HandleAgentSit(ControllingClient, UUID); | 2414 | HandleAgentSit(ControllingClient, UUID); |
2414 | 2415 | ||
@@ -2436,7 +2437,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2436 | if (part != null) | 2437 | if (part != null) |
2437 | { | 2438 | { |
2438 | m_requestedSitTargetID = part.LocalId; | 2439 | m_requestedSitTargetID = part.LocalId; |
2439 | m_requestedSitTargetUUID = targetID; | 2440 | m_requestedSitTargetUUID = part.UUID; |
2440 | 2441 | ||
2441 | } | 2442 | } |
2442 | else | 2443 | else |
@@ -2635,6 +2636,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2635 | } | 2636 | } |
2636 | Animator.TrySetMovementAnimation(sitAnimation); | 2637 | Animator.TrySetMovementAnimation(sitAnimation); |
2637 | SendAvatarDataToAllAgents(); | 2638 | SendAvatarDataToAllAgents(); |
2639 | TriggerScenePresenceUpdated(); | ||
2638 | } | 2640 | } |
2639 | } | 2641 | } |
2640 | 2642 | ||
@@ -2643,6 +2645,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2643 | // m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick.. | 2645 | // m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick.. |
2644 | m_AngularVelocity = Vector3.Zero; | 2646 | m_AngularVelocity = Vector3.Zero; |
2645 | Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED"); | 2647 | Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED"); |
2648 | TriggerScenePresenceUpdated(); | ||
2646 | SitGround = true; | 2649 | SitGround = true; |
2647 | RemoveFromPhysicalScene(); | 2650 | RemoveFromPhysicalScene(); |
2648 | } | 2651 | } |
@@ -2659,11 +2662,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2659 | public void HandleStartAnim(IClientAPI remoteClient, UUID animID) | 2662 | public void HandleStartAnim(IClientAPI remoteClient, UUID animID) |
2660 | { | 2663 | { |
2661 | Animator.AddAnimation(animID, UUID.Zero); | 2664 | Animator.AddAnimation(animID, UUID.Zero); |
2665 | TriggerScenePresenceUpdated(); | ||
2662 | } | 2666 | } |
2663 | 2667 | ||
2664 | public void HandleStopAnim(IClientAPI remoteClient, UUID animID) | 2668 | public void HandleStopAnim(IClientAPI remoteClient, UUID animID) |
2665 | { | 2669 | { |
2666 | Animator.RemoveAnimation(animID, false); | 2670 | Animator.RemoveAnimation(animID, false); |
2671 | TriggerScenePresenceUpdated(); | ||
2667 | } | 2672 | } |
2668 | 2673 | ||
2669 | public void avnHandleChangeAnim(UUID animID, bool addRemove,bool sendPack) | 2674 | public void avnHandleChangeAnim(UUID animID, bool addRemove,bool sendPack) |
@@ -3693,7 +3698,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3693 | 3698 | ||
3694 | // if (m_updateCount > 0) | 3699 | // if (m_updateCount > 0) |
3695 | // { | 3700 | // { |
3696 | Animator.UpdateMovementAnimations(); | 3701 | if (Animator.UpdateMovementAnimations()) |
3702 | TriggerScenePresenceUpdated(); | ||
3697 | // m_updateCount--; | 3703 | // m_updateCount--; |
3698 | // } | 3704 | // } |
3699 | 3705 | ||