diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1a3e3bb..5d4ddea 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -85,7 +85,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
85 | public bool m_trustBinaries; | 85 | public bool m_trustBinaries; |
86 | public bool m_allowScriptCrossings; | 86 | public bool m_allowScriptCrossings; |
87 | public bool m_useFlySlow; | 87 | public bool m_useFlySlow; |
88 | public bool m_usePreJump; | ||
89 | 88 | ||
90 | protected float m_defaultDrawDistance = 255.0f; | 89 | protected float m_defaultDrawDistance = 255.0f; |
91 | public float DefaultDrawDistance | 90 | public float DefaultDrawDistance |
@@ -671,8 +670,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
671 | 670 | ||
672 | //Animation states | 671 | //Animation states |
673 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | 672 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); |
674 | // TODO: Change default to true once the feature is supported | ||
675 | m_usePreJump = startupConfig.GetBoolean("enableprejump", true); | ||
676 | 673 | ||
677 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); | 674 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); |
678 | 675 | ||
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1067b9d..76bc390 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1813,8 +1813,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1813 | if (SitGround) | 1813 | if (SitGround) |
1814 | StandUp(); | 1814 | StandUp(); |
1815 | 1815 | ||
1816 | m_log.DebugFormat( | 1816 | // m_log.DebugFormat( |
1817 | "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", | 1817 | // "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", |
1818 | Name, pos, m_scene.RegionInfo.RegionName); | 1818 | Name, pos, m_scene.RegionInfo.RegionName); |
1819 | 1819 | ||
1820 | if (pos.X < 0 || pos.X >= Constants.RegionSize | 1820 | if (pos.X < 0 || pos.X >= Constants.RegionSize |
@@ -1879,7 +1879,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1879 | /// </summary> | 1879 | /// </summary> |
1880 | public void ResetMoveToTarget() | 1880 | public void ResetMoveToTarget() |
1881 | { | 1881 | { |
1882 | m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); | 1882 | // m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); |
1883 | 1883 | ||
1884 | MovingToTarget = false; | 1884 | MovingToTarget = false; |
1885 | MoveToPositionTarget = Vector3.Zero; | 1885 | MoveToPositionTarget = Vector3.Zero; |