diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
2 files changed, 4 insertions, 4 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; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index e7f2fdb..8939342 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2423,9 +2423,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2423 | for (int i = 0; i < parts.Length; i++) | 2423 | for (int i = 0; i < parts.Length; i++) |
2424 | { | 2424 | { |
2425 | SceneObjectPart part = parts[i]; | 2425 | SceneObjectPart part = parts[i]; |
2426 | if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax || | 2426 | if (part.Scale.X > m_scene.m_maxPhys || |
2427 | part.Scale.Y > m_scene.RegionInfo.PhysPrimMax || | 2427 | part.Scale.Y > m_scene.m_maxPhys || |
2428 | part.Scale.Z > m_scene.RegionInfo.PhysPrimMax) | 2428 | part.Scale.Z > m_scene.m_maxPhys ) |
2429 | { | 2429 | { |
2430 | UsePhysics = false; // Reset physics | 2430 | UsePhysics = false; // Reset physics |
2431 | break; | 2431 | break; |