Remove enableprejump config option and associated code as this is now

fully functional and cannot be disabled because that would break timings.

2 files changed, 0 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0832975..1e111e5 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 
@@ -649,8 +648,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", false);
 
                 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index bf1976c..7ea710e 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"