From 36ed0dcdaa37e107a5512a8369eedc4151197efd Mon Sep 17 00:00:00 2001
From: nebadon
Date: Sat, 4 Feb 2012 19:45:10 -0700
Subject: change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make
 the variable in OpenSim.ini and Regions.ini match

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

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
                 PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
                 CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
 
-                m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
+                m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys);
                 if (RegionInfo.NonphysPrimMax > 0)
                 {
                     m_maxNonphys = RegionInfo.NonphysPrimMax;
-- 
cgit v1.1


From 4e11983c7c2ba153f3d359e9b5a587fc966deb09 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 5 Feb 2012 12:38:20 -0500
Subject: Make configuration uniform

	Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework')

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
                     for (int i = 0; i < parts.Length; i++)
                     {
                         SceneObjectPart part = parts[i];
-                        if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax || 
-                            part.Scale.Y > m_scene.RegionInfo.PhysPrimMax || 
-                            part.Scale.Z > m_scene.RegionInfo.PhysPrimMax)
+                        if (part.Scale.X > m_scene.m_maxPhys ||
+                            part.Scale.Y > m_scene.m_maxPhys ||
+                            part.Scale.Z > m_scene.m_maxPhys )
                         {
                             UsePhysics = false; // Reset physics
                             break;
-- 
cgit v1.1