Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2 files changed, 9 insertions, 9 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 62ce451..9d34854 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -133,14 +133,6 @@
     ;; Usually this is only a box.
     ; meshing = Meshmerizer
     ; meshing = ZeroMesher
-    
-    ;# {CacheSculptMaps} {Cache decoded sculpt maps?} {true false} true

-    ;; if you use Meshmerizer and want sculpt map collisions, setting this to

-    ;; to true will store decoded sculpt maps in a special folder in your bin

-    ;; folder, which can reduce startup times by reducing asset requests. Some

-    ;; versions of mono dont work well when reading the cache files, so set this

-    ;; to false if you have compatability problems.

-     CacheSculptMaps = false
 
     ;; Choose one of the physics engines below
     ;; OpenDynamicsEngine is by some distance the most developed physics engine
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index f939cc8..53d8ab7 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -139,7 +139,15 @@
     ;; Path to decoded sculpty maps
     ;; Defaults to "j2kDecodeCache
     ;DecodedSculptMapPath = "j2kDecodeCache"
-
+    
+    ;# {CacheSculptMaps} {Cache decoded sculpt maps?} {true false} true

+    ;; if you use Meshmerizer and want sculpt map collisions, setting this to

+    ;; to true will store decoded sculpt maps in a special folder in your bin

+    ;; folder, which can reduce startup times by reducing asset requests. Some

+    ;; versions of mono dont work well when reading the cache files, so set this

+    ;; to false if you have compatability problems.

+    ; CacheSculptMaps = true
+    
     ; Choose one of the physics engines below
     ; OpenDynamicsEngine is by some distance the most developed physics engine
     ; basicphysics effectively does not model physics at all, making all objects phantom