diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs | 3 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 7 |
3 files changed, 13 insertions, 1 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; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs index 99ac722..6ebd675 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPartInventory.cs | |||
@@ -241,7 +241,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
241 | 241 | ||
242 | if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts) | 242 | if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts) |
243 | { | 243 | { |
244 | if (stateSource == 1) // Prim crossing | 244 | if (stateSource == 1 && // Prim crossing |
245 | m_part.ParentGroup.Scene.m_trustBinaries) | ||
245 | { | 246 | { |
246 | m_items[item.ItemID].PermsMask = 0; | 247 | m_items[item.ItemID].PermsMask = 0; |
247 | m_items[item.ItemID].PermsGranter = UUID.Zero; | 248 | m_items[item.ItemID].PermsGranter = UUID.Zero; |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index f34cf09..eeb8f04 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -48,6 +48,13 @@ | |||
48 | PhysicalPrimMax = 10 | 48 | PhysicalPrimMax = 10 |
49 | ClampPrimSize = false | 49 | ClampPrimSize = false |
50 | 50 | ||
51 | ; Region crossing | ||
52 | AllowScriptCrossing = false | ||
53 | ; If you set this to "true", any region that can teleport to you can | ||
54 | ; inject ARBITRARY BINARY CODE into your system. Use at your own risk. | ||
55 | ; YOU HAVE BEEN WARNED!!! | ||
56 | TrustBinaries = false | ||
57 | |||
51 | ; ## | 58 | ; ## |
52 | ; ## STORAGE | 59 | ; ## STORAGE |
53 | ; ## | 60 | ; ## |