aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authornebadon2012-02-04 19:45:10 -0700
committernebadon2012-02-04 19:45:10 -0700
commit36ed0dcdaa37e107a5512a8369eedc4151197efd (patch)
treeae974e58a39d3cafa586ea81d439fa5aa71dc01f
parentchange NonPhysicalPrimMax to NonphysicalPrimMax to make this variable (diff)
downloadopensim-SC_OLD-36ed0dcdaa37e107a5512a8369eedc4151197efd.zip
opensim-SC_OLD-36ed0dcdaa37e107a5512a8369eedc4151197efd.tar.gz
opensim-SC_OLD-36ed0dcdaa37e107a5512a8369eedc4151197efd.tar.bz2
opensim-SC_OLD-36ed0dcdaa37e107a5512a8369eedc4151197efd.tar.xz
change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make the
variable in OpenSim.ini and Regions.ini match
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 186e01c..3347822 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes
645 PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); 645 PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
646 CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); 646 CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
647 647
648 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); 648 m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys);
649 if (RegionInfo.NonphysPrimMax > 0) 649 if (RegionInfo.NonphysPrimMax > 0)
650 { 650 {
651 m_maxNonphys = RegionInfo.NonphysPrimMax; 651 m_maxNonphys = RegionInfo.NonphysPrimMax;