Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2 files changed, 2 insertions, 2 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f9b405d..d45f72b 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -87,7 +87,7 @@
 
     ;# {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
+    ; NonphysicalPrimMax = 256
 
     ;# {PhysicalPrimMax} {} {Maximum 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 3b39f7f..6e6e4eb 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -82,7 +82,7 @@
     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
+    NonphysicalPrimMax = 256
 
     ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file.
     PhysicalPrimMax = 10