aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2014-07-23 22:28:51 +0100
committerUbitUmarov2014-07-23 22:28:51 +0100
commitf6af5f49966f1a2269ee6ceb5e7694a8e3f67cdd (patch)
treeb517b8f57008527d9580b65b0935baa829482f49 /OpenSim/Region/Framework
parent do CompleteMovement with InTransit set as core (diff)
downloadopensim-SC-f6af5f49966f1a2269ee6ceb5e7694a8e3f67cdd.zip
opensim-SC-f6af5f49966f1a2269ee6ceb5e7694a8e3f67cdd.tar.gz
opensim-SC-f6af5f49966f1a2269ee6ceb5e7694a8e3f67cdd.tar.bz2
opensim-SC-f6af5f49966f1a2269ee6ceb5e7694a8e3f67cdd.tar.xz
change last commit setting intransit without messing flight
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 07564ba..e7462ba 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1646,9 +1646,9 @@ namespace OpenSim.Region.Framework.Scenes
1646 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}", 1646 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
1647 client.Name, Scene.Name, AbsolutePosition); 1647 client.Name, Scene.Name, AbsolutePosition);
1648 1648
1649 bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); 1649
1650 1650
1651 IsInTransit = true; 1651 m_inTransit = true;
1652 try 1652 try
1653 { 1653 {
1654 // Make sure it's not a login agent. We don't want to wait for updates during login 1654 // Make sure it's not a login agent. We don't want to wait for updates during login
@@ -1679,7 +1679,7 @@ namespace OpenSim.Region.Framework.Scenes
1679 AbsolutePosition = pos; 1679 AbsolutePosition = pos;
1680 } 1680 }
1681 1681
1682 1682 bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
1683 if (!MakeRootAgent(AbsolutePosition, flying)) 1683 if (!MakeRootAgent(AbsolutePosition, flying))
1684 { 1684 {
1685 m_log.DebugFormat( 1685 m_log.DebugFormat(
@@ -1756,7 +1756,7 @@ namespace OpenSim.Region.Framework.Scenes
1756 } 1756 }
1757 finally 1757 finally
1758 { 1758 {
1759 IsInTransit = false; 1759 m_inTransit = false;
1760 } 1760 }
1761 } 1761 }
1762 1762