From 12bc6a7414068554c4499ef4d2100692f5c8c9ec Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 8 Oct 2010 03:08:05 +0100
Subject: Clarify the format comment at the top of OpenSim.ini.example

---
 bin/OpenSim.ini.example | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 91f6068..62ce451 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -13,7 +13,10 @@
 ;;    An empty question will set the default if the dependencies are
 ;;    satisfied.
 ;;
-;; ; denotes a commented option. It is ignored.
+;; ;  denotes a commented out option. Uncomment it to actvate it
+;;    and change it to the desired value
+;;    Any options added to OpenSim.ini.exmaple must be commented out,
+;;    and their value must represent the default.
 
 [Startup]
     ;# {save_crashes} {} {Save crashes to disk?} {true false} false
-- 
cgit v1.1


From 9391c3ffee4fb722657ebb064f8ba02f1d1f8802 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 7 Oct 2010 19:34:46 -0700
Subject: add a flag in OpenSim.ini.example for enabling/disabling decoded
 sculpt map caching for meshing

---
 bin/OpenSim.ini.example | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1625de0..91f6068 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -130,6 +130,14 @@
     ;; 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
-- 
cgit v1.1


From 0d9c94033d5180292bc8618b8b0f79a8531c3b8d Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 7 Oct 2010 19:48:17 -0700
Subject: move CacheSculptMaps ini flag to OpenSimDefaults.ini comment it and
 change defailt to true to reflect code

---
 bin/OpenSim.ini.example |  8 --------
 bin/OpenSimDefaults.ini | 10 +++++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 91f6068..1625de0 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -130,14 +130,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
-- 
cgit v1.1