aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorlbsa712009-07-24 06:59:27 +0000
committerlbsa712009-07-24 06:59:27 +0000
commit169a353cca000f2e57b3895d6110c18bd5757137 (patch)
treea83bceebe2c28a340a643f77de8bff702918180c /OpenSim/Region/Framework/Scenes/Scene.cs
parent* Updates RESTInterregionComms and LocalInterregionComms to the new region mo... (diff)
downloadopensim-SC_OLD-169a353cca000f2e57b3895d6110c18bd5757137.zip
opensim-SC_OLD-169a353cca000f2e57b3895d6110c18bd5757137.tar.gz
opensim-SC_OLD-169a353cca000f2e57b3895d6110c18bd5757137.tar.bz2
opensim-SC_OLD-169a353cca000f2e57b3895d6110c18bd5757137.tar.xz
* minor ccc
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c39cb2d..0b466f7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -401,19 +401,25 @@ namespace OpenSim.Region.Framework.Scenes
401 401
402 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 402 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
403 if (RegionInfo.NonphysPrimMax > 0) 403 if (RegionInfo.NonphysPrimMax > 0)
404 {
404 m_maxNonphys = RegionInfo.NonphysPrimMax; 405 m_maxNonphys = RegionInfo.NonphysPrimMax;
406 }
405 407
406 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys); 408 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys);
407 409
408 if (RegionInfo.PhysPrimMax > 0) 410 if (RegionInfo.PhysPrimMax > 0)
411 {
409 m_maxPhys = RegionInfo.PhysPrimMax; 412 m_maxPhys = RegionInfo.PhysPrimMax;
413 }
410 414
411 // Here, if clamping is requested in either global or 415 // Here, if clamping is requested in either global or
412 // local config, it will be used 416 // local config, it will be used
413 // 417 //
414 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize); 418 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize);
415 if (RegionInfo.ClampPrimSize) 419 if (RegionInfo.ClampPrimSize)
420 {
416 m_clampPrimSize = true; 421 m_clampPrimSize = true;
422 }
417 423
418 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); 424 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
419 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); 425 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);