Add configuration values for scripted prim region crossing

0.6.1-post-fixes
Melanie Thielker 2008-11-29 14:26:42 +00:00
parent af5e9147f0
commit b6fef0fdb8
3 changed files with 13 additions and 1 deletions

View File

@ -90,6 +90,8 @@ namespace OpenSim.Region.Environment.Scenes
public float m_maxNonphys = 65536; public float m_maxNonphys = 65536;
public float m_maxPhys = 10; public float m_maxPhys = 10;
public bool m_clampPrimSize = false; public bool m_clampPrimSize = false;
public bool m_trustBinaries = false;
public bool m_allowScriptCrossings = false;
public bool m_seeIntoRegionFromNeighbor; public bool m_seeIntoRegionFromNeighbor;
public int MaxUndoCount = 5; public int MaxUndoCount = 5;
@ -337,6 +339,8 @@ namespace OpenSim.Region.Environment.Scenes
m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f);
m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f);
m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false); m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false);
m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", false);
m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossings", false);
m_dontPersistBefore = m_dontPersistBefore =
startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
m_dontPersistBefore *= 10000000; m_dontPersistBefore *= 10000000;

View File

@ -241,7 +241,8 @@ namespace OpenSim.Region.Environment.Scenes
if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts) if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts)
{ {
if (stateSource == 1) // Prim crossing if (stateSource == 1 && // Prim crossing
m_part.ParentGroup.Scene.m_trustBinaries)
{ {
m_items[item.ItemID].PermsMask = 0; m_items[item.ItemID].PermsMask = 0;
m_items[item.ItemID].PermsGranter = UUID.Zero; m_items[item.ItemID].PermsGranter = UUID.Zero;

View File

@ -48,6 +48,13 @@
PhysicalPrimMax = 10 PhysicalPrimMax = 10
ClampPrimSize = false ClampPrimSize = false
; Region crossing
AllowScriptCrossing = false
; If you set this to "true", any region that can teleport to you can
; inject ARBITRARY BINARY CODE into your system. Use at your own risk.
; YOU HAVE BEEN WARNED!!!
TrustBinaries = false
; ## ; ##
; ## STORAGE ; ## STORAGE
; ## ; ##