aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-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 ce63946..e4e5f17 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -718,7 +718,16 @@ namespace OpenSim.Region.Framework.Scenes
718 public bool IsInTransit 718 public bool IsInTransit
719 { 719 {
720 get { return m_inTransit; } 720 get { return m_inTransit; }
721 private set { m_inTransit = value; } 721 set {
722 if(value)
723 {
724 if ((PhysicsActor != null) && PhysicsActor.Flying)
725 m_AgentControlFlags |= AgentManager.ControlFlags.AGENT_CONTROL_FLY;
726 else if ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0)
727 m_AgentControlFlags &= ~AgentManager.ControlFlags.AGENT_CONTROL_FLY;
728 }
729 m_inTransit = value;
730 }
722 } 731 }
723 732
724 private float m_speedModifier = 1.0f; 733 private float m_speedModifier = 1.0f;
@@ -2946,16 +2955,6 @@ namespace OpenSim.Region.Framework.Scenes
2946 } 2955 }
2947 } 2956 }
2948 2957
2949 public void InTransit()
2950 {
2951 IsInTransit = true;
2952
2953 if ((PhysicsActor != null) && PhysicsActor.Flying)
2954 m_AgentControlFlags |= AgentManager.ControlFlags.AGENT_CONTROL_FLY;
2955 else if ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0)
2956 m_AgentControlFlags &= ~AgentManager.ControlFlags.AGENT_CONTROL_FLY;
2957 }
2958
2959 public void NotInTransit() 2958 public void NotInTransit()
2960 { 2959 {
2961 IsInTransit = false; 2960 IsInTransit = false;