diff options
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
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 | |||
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 |
@@ -649,8 +648,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
649 | 648 | ||
650 | //Animation states | 649 | //Animation states |
651 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | 650 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); |
652 | // TODO: Change default to true once the feature is supported | ||
653 | m_usePreJump = startupConfig.GetBoolean("enableprejump", false); | ||
654 | 651 | ||
655 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); | 652 | m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); |
656 | 653 | ||
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 @@ | |||
298 | ; won't look right until the physics engine supports it | 298 | ; won't look right until the physics engine supports it |
299 | ; (i.e delays takeoff for a moment) | 299 | ; (i.e delays takeoff for a moment) |
300 | 300 | ||
301 | ; This is commented so it will come on automatically once it's | ||
302 | ; supported. | ||
303 | ; enableprejump = true | ||
304 | |||
305 | ; Simulator Stats URI | 301 | ; Simulator Stats URI |
306 | ; Enable JSON simulator data by setting a URI name (case sensitive) | 302 | ; Enable JSON simulator data by setting a URI name (case sensitive) |
307 | ; Stats_URI = "jsonSimStats" | 303 | ; Stats_URI = "jsonSimStats" |