Merge branch 'master' into careminster-presence-refactor

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

2 files changed, 13 insertions, 2 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1625de0..9d34854 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
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