aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs21
1 files changed, 10 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c5a241a..925a4f3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -782,7 +782,16 @@ namespace OpenSim.Region.Framework.Scenes
782 public bool IsInTransit 782 public bool IsInTransit
783 { 783 {
784 get { return m_inTransit; } 784 get { return m_inTransit; }
785 private set { m_inTransit = value; } 785 set {
786 if(value)
787 {
788 if ((PhysicsActor != null) && PhysicsActor.Flying)
789 m_AgentControlFlags |= AgentManager.ControlFlags.AGENT_CONTROL_FLY;
790 else if ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0)
791 m_AgentControlFlags &= ~AgentManager.ControlFlags.AGENT_CONTROL_FLY;
792 }
793 m_inTransit = value;
794 }
786 } 795 }
787 796
788 private float m_speedModifier = 1.0f; 797 private float m_speedModifier = 1.0f;
@@ -3298,16 +3307,6 @@ namespace OpenSim.Region.Framework.Scenes
3298 } 3307 }
3299 } 3308 }
3300 3309
3301 public void InTransit()
3302 {
3303 IsInTransit = true;
3304
3305 if ((PhysicsActor != null) && PhysicsActor.Flying)
3306 m_AgentControlFlags |= AgentManager.ControlFlags.AGENT_CONTROL_FLY;
3307 else if ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0)
3308 m_AgentControlFlags &= ~AgentManager.ControlFlags.AGENT_CONTROL_FLY;
3309 }
3310
3311 public void NotInTransit() 3310 public void NotInTransit()
3312 { 3311 {
3313 IsInTransit = false; 3312 IsInTransit = false;