aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs20
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 13b9169..f652e21 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -370,10 +370,25 @@ namespace OpenSim.Region.Environment.Scenes
370 370
371 try 371 try
372 { 372 {
373 // Region config overrides global config
374 //
373 IConfig startupConfig = m_config.Configs["Startup"]; 375 IConfig startupConfig = m_config.Configs["Startup"];
374 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); 376 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f);
377 if (RegionInfo.NonphysPrimMax > 0)
378 m_maxNonphys = RegionInfo.NonphysPrimMax;
379
375 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); 380 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f);
381
382 if (RegionInfo.PhysPrimMax > 0)
383 m_maxPhys = RegionInfo.PhysPrimMax;
384
385 // Here, if clamping is requested in either global or
386 // local config, it will be used
387 //
376 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false); 388 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false);
389 if (RegionInfo.ClampPrimSize)
390 m_clampPrimSize = true;
391
377 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", false); 392 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", false);
378 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", false); 393 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", false);
379 m_dontPersistBefore = 394 m_dontPersistBefore =
@@ -3290,6 +3305,11 @@ namespace OpenSim.Region.Environment.Scenes
3290 3305
3291 public void SetObjectCapacity(int objects) 3306 public void SetObjectCapacity(int objects)
3292 { 3307 {
3308 // Region specific config overrides global
3309 //
3310 if (RegionInfo.ObjectCapacity != 0)
3311 objects = RegionInfo.ObjectCapacity;
3312
3293 if (m_statsReporter != null) 3313 if (m_statsReporter != null)
3294 { 3314 {
3295 m_statsReporter.SetObjectCapacity(objects); 3315 m_statsReporter.SetObjectCapacity(objects);