From 509bf3fa53efd7d6934871025643f0087c3834e1 Mon Sep 17 00:00:00 2001
From: BlueWall <jamesh@bluewallgroup.com>
Date: Tue, 18 Sep 2012 09:47:15 -0400
Subject: [PATCH] Fix some inconsistencies in configurartion: NonPhys prims

  Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*.

  Please update your OpenSim.ini and Regions.ini to reflect these changes.
---
 OpenSim/Framework/RegionInfo.cs          | 8 ++++----
 OpenSim/Region/Framework/Scenes/Scene.cs | 6 +++---
 bin/OpenSim.ini.example                  | 8 ++++----
 bin/OpenSimDefaults.ini                  | 4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 928e79896e..016f2a6d18 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -643,11 +643,11 @@ namespace OpenSim.Framework
 
             #region Prim stuff
 
-            m_nonphysPrimMin = config.GetFloat("NonphysicalPrimMin", 0);
-            allKeys.Remove("NonphysicalPrimMin");
+            m_nonphysPrimMin = config.GetFloat("NonPhysicalPrimMin", 0);
+            allKeys.Remove("NonPhysicalPrimMin");
 
-            m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0);
-            allKeys.Remove("NonphysicalPrimMax");
+            m_nonphysPrimMax = config.GetInt("NonPhysicalPrimMax", 0);
+            allKeys.Remove("NonPhysicalPrimMax");
 
             m_physPrimMin = config.GetFloat("PhysicalPrimMin", 0);
             allKeys.Remove("PhysicalPrimMin");
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9c3c53df0c..a27e1266f4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Minimum value of the size of a physical prim in each axis
         /// </summary>
-        public float m_minPhys = 0.01f;
+        public float m_minPhys = 0.001f;
 
         /// <summary>
         /// Maximum value of the size of a physical prim in each axis
@@ -744,13 +744,13 @@ namespace OpenSim.Region.Framework.Scenes
                 PhysicalPrims = startupConfig.GetBoolean("physical_prim", PhysicalPrims);
                 CollidablePrims = startupConfig.GetBoolean("collidable_prim", CollidablePrims);
 
-                m_minNonphys = startupConfig.GetFloat("NonphysicalPrimMin", m_minNonphys);
+                m_minNonphys = startupConfig.GetFloat("NonPhysicalPrimMin", m_minNonphys);
                 if (RegionInfo.NonphysPrimMin > 0)
                 {
                     m_minNonphys = RegionInfo.NonphysPrimMin;
                 }
 
-                m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys);
+                m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
                 if (RegionInfo.NonphysPrimMax > 0)
                 {
                     m_maxNonphys = RegionInfo.NonphysPrimMax;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 0de40022ff..cd90517ba2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -88,12 +88,12 @@
     ; allow_regionless = false
 
     ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.01
-    ;; Minimum size for non-physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMin!).
-    ; NonphysicalPrimMin = 0.01
+    ;; Minimum size for non-physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonPhysicalPrimMin!).
+    ; NonPhysicalPrimMin = 0.01
 
     ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
-    ;; Maximum size for non-physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
-    ; NonphysicalPrimMax = 256
+    ;; Maximum size for non-physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonPhysicalPrimMax!).
+    ; NonPhysicalPrimMax = 256
 
     ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 10
     ;; Maximum size where a prim can be physical.  Affects resizing of existing prims.  This can be overriden in the region config file.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0173f5bdfe..ef4f5781b2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -85,8 +85,8 @@
     ;; from the selected region_info_source.
     allow_regionless = false
 
-    ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
-    NonphysicalPrimMax = 256
+    ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonPhysicalPrimMax!).
+    NonPhysicalPrimMax = 256
 
     ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file.
     PhysicalPrimMax = 10