diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 03ddbc5..ec5cf32 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -668,8 +668,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
668 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); | 668 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); |
669 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); | 669 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); |
670 | 670 | ||
671 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); | 671 | m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); |
672 | |||
673 | if (RegionInfo.NonphysPrimMax > 0) | 672 | if (RegionInfo.NonphysPrimMax > 0) |
674 | { | 673 | { |
675 | m_maxNonphys = RegionInfo.NonphysPrimMax; | 674 | m_maxNonphys = RegionInfo.NonphysPrimMax; |