diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 03d79f1..92738a2 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -90,6 +90,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
90 | public float m_maxNonphys = 65536; | 90 | public float m_maxNonphys = 65536; |
91 | public float m_maxPhys = 10; | 91 | public float m_maxPhys = 10; |
92 | public bool m_clampPrimSize = false; | 92 | public bool m_clampPrimSize = false; |
93 | public bool m_trustBinaries = false; | ||
94 | public bool m_allowScriptCrossings = false; | ||
93 | 95 | ||
94 | public bool m_seeIntoRegionFromNeighbor; | 96 | public bool m_seeIntoRegionFromNeighbor; |
95 | public int MaxUndoCount = 5; | 97 | public int MaxUndoCount = 5; |
@@ -337,6 +339,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
337 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); | 339 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); |
338 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); | 340 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); |
339 | m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false); | 341 | m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false); |
342 | m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", false); | ||
343 | m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossings", false); | ||
340 | m_dontPersistBefore = | 344 | m_dontPersistBefore = |
341 | startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); | 345 | startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); |
342 | m_dontPersistBefore *= 10000000; | 346 | m_dontPersistBefore *= 10000000; |