diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 37e5286..4fc207a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2297,6 +2297,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2297 | 2297 | ||
2298 | public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset) | 2298 | public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset) |
2299 | { | 2299 | { |
2300 | if (IsChildAgent) | ||
2301 | return; | ||
2302 | |||
2300 | if (ParentID != 0) | 2303 | if (ParentID != 0) |
2301 | { | 2304 | { |
2302 | if (ParentPart.UUID == targetID) | 2305 | if (ParentPart.UUID == targetID) |
@@ -2523,6 +2526,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2523 | 2526 | ||
2524 | public void HandleAgentSit(IClientAPI remoteClient, UUID agentID) | 2527 | public void HandleAgentSit(IClientAPI remoteClient, UUID agentID) |
2525 | { | 2528 | { |
2529 | if (IsChildAgent) | ||
2530 | return; | ||
2531 | |||
2526 | SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID); | 2532 | SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID); |
2527 | 2533 | ||
2528 | if (part != null) | 2534 | if (part != null) |
@@ -2583,6 +2589,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2583 | 2589 | ||
2584 | public void HandleAgentSitOnGround() | 2590 | public void HandleAgentSitOnGround() |
2585 | { | 2591 | { |
2592 | if (IsChildAgent) | ||
2593 | return; | ||
2594 | |||
2586 | // m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick.. | 2595 | // m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick.. |
2587 | m_AngularVelocity = Vector3.Zero; | 2596 | m_AngularVelocity = Vector3.Zero; |
2588 | Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED"); | 2597 | Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED"); |