diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1a3e3bb980..5d4ddea33c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -85,7 +85,6 @@ namespace OpenSim.Region.Framework.Scenes public bool m_trustBinaries; public bool m_allowScriptCrossings; public bool m_useFlySlow; - public bool m_usePreJump; protected float m_defaultDrawDistance = 255.0f; public float DefaultDrawDistance @@ -671,8 +670,6 @@ namespace OpenSim.Region.Framework.Scenes //Animation states m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); - // TODO: Change default to true once the feature is supported - m_usePreJump = startupConfig.GetBoolean("enableprejump", true); m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1067b9d57e..76bc390aa0 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1813,8 +1813,8 @@ namespace OpenSim.Region.Framework.Scenes if (SitGround) StandUp(); - m_log.DebugFormat( - "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", +// m_log.DebugFormat( +// "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", Name, pos, m_scene.RegionInfo.RegionName); if (pos.X < 0 || pos.X >= Constants.RegionSize @@ -1879,7 +1879,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void ResetMoveToTarget() { - m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); +// m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); MovingToTarget = false; MoveToPositionTarget = Vector3.Zero; diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a02de72750..3e6a8939d7 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -298,10 +298,6 @@ ; won't look right until the physics engine supports it ; (i.e delays takeoff for a moment) - ; This is commented so it will come on automatically once it's - ; supported. - ; enableprejump = true - ; Simulator Stats URI ; Enable JSON simulator data by setting a URI name (case sensitive) ; Stats_URI = "jsonSimStats"