aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 3460e8f..a0bab1a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -622,10 +622,16 @@ namespace OpenSim.Region.Environment.Scenes
622 622
623 if (PhysicsActor == null) 623 if (PhysicsActor == null)
624 { 624 {
625 // Console.WriteLine("DEBUG: HandleAgentUpdate: null PhysicsActor!");
626 return; 625 return;
627 } 626 }
628 627
628 if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
629 {
630 // TODO: This doesn't quite work yet -- probably a parent ID problem
631 // m_parentID = (what should this be?)
632 // SetMovementAnimation(Animations.AnimsLLUUID["SIT_GROUND"], 1);
633 }
634
629 if (m_allowMovement) 635 if (m_allowMovement)
630 { 636 {
631 int i = 0; 637 int i = 0;
@@ -693,7 +699,8 @@ namespace OpenSim.Region.Environment.Scenes
693 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); 699 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
694 m_parentPosition = new LLVector3(); 700 m_parentPosition = new LLVector3();
695 701
696 AddToPhysicalScene(); 702 if (m_physicsActor == null)
703 AddToPhysicalScene();
697 704
698 m_parentID = 0; 705 m_parentID = 0;
699 SendFullUpdateToAllClients(); 706 SendFullUpdateToAllClients();