aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-11 03:10:28 +0000
committerMelanie Thielker2008-11-11 03:10:28 +0000
commit89570e16376d1b6c79cec0b6ad013ec51e93053d (patch)
treece154bf5d12c8de2597d0ddd569d31b80ddff873
parentFix a nullref in attachment packing (diff)
downloadopensim-SC-89570e16376d1b6c79cec0b6ad013ec51e93053d.zip
opensim-SC-89570e16376d1b6c79cec0b6ad013ec51e93053d.tar.gz
opensim-SC-89570e16376d1b6c79cec0b6ad013ec51e93053d.tar.bz2
opensim-SC-89570e16376d1b6c79cec0b6ad013ec51e93053d.tar.xz
Add ClampPrimSize option to ensure no prim can exceed the set size. This
will allow people who don't want megaprims in their sim to prevent them from being created. Any prim rezzed or pulled across the border will be clamped to the size specified in OpenSim.ini if this option is set.
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--bin/OpenSim.ini.example1
2 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index f686a9f..68fac59 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -81,6 +81,7 @@ namespace OpenSim.Region.Environment.Scenes
81 public bool m_physicalPrim; 81 public bool m_physicalPrim;
82 public float m_maxNonphys = 65536; 82 public float m_maxNonphys = 65536;
83 public float m_maxPhys = 10; 83 public float m_maxPhys = 10;
84 public bool m_clampPrimSize = false;
84 85
85 public bool m_seeIntoRegionFromNeighbor; 86 public bool m_seeIntoRegionFromNeighbor;
86 public int MaxUndoCount = 5; 87 public int MaxUndoCount = 5;
@@ -326,6 +327,7 @@ namespace OpenSim.Region.Environment.Scenes
326 IConfig startupConfig = m_config.Configs["Startup"]; 327 IConfig startupConfig = m_config.Configs["Startup"];
327 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); 328 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f);
328 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); 329 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f);
330 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false);
329 331
330 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); 332 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine");
331 } 333 }
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 369f940..6b3cb94 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -37,6 +37,7 @@ TextureOnMapTile = false
37; Maximum total size, and maximum size where a prim can be physical 37; Maximum total size, and maximum size where a prim can be physical
38NonPhysicalPrimMax = 256 38NonPhysicalPrimMax = 256
39PhysicalPrimMax = 10 39PhysicalPrimMax = 10
40ClampPrimSize = false
40 41
41; ## 42; ##
42; ## STORAGE 43; ## STORAGE