ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplified IsInTransit property on ScenePresence and removed InTransit() which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit().

Browse Source
This commit is contained in:
Dan Lake
2011-10-06 12:39:19 -07:00
parent 08f264d096
commit 9a16e76f51
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -718,7 +718,16 @@ namespace OpenSim.Region.Framework.Scenes
public bool IsInTransit
{
get { return m_inTransit; }
private set { m_inTransit = value; }
set {
if(value)
{
if ((PhysicsActor != null) && PhysicsActor.Flying)
m_AgentControlFlags |= AgentManager.ControlFlags.AGENT_CONTROL_FLY;
else if ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0)
m_AgentControlFlags &= ~AgentManager.ControlFlags.AGENT_CONTROL_FLY;
}
m_inTransit = value;
}
}
private float m_speedModifier = 1.0f;
@@ -2946,16 +2955,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public void InTransit()
{
IsInTransit = true;
if ((PhysicsActor != null) && PhysicsActor.Flying)
m_AgentControlFlags |= AgentManager.ControlFlags.AGENT_CONTROL_FLY;
else if ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0)
m_AgentControlFlags &= ~AgentManager.ControlFlags.AGENT_CONTROL_FLY;
}
public void NotInTransit()
{
IsInTransit = false;