From 6f689f591a295195cf8db3c37bcd382502d468d7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 26 Sep 2010 17:56:31 +0100
Subject: Merge Master

---
 bin/OpenSim.ini.example | 4 ++++
 bin/OpenSimDefaults.ini | 6 ++++++
 2 files changed, 10 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 109e0aa..2b78014 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -546,6 +546,10 @@
     ;; prims
     ; DisableUndergroundMovement = true
 
+    ;; Path to script engine assemblies
+    ;; Default is ./bin/ScriptEngines
+    ; ScriptEnginesPath = "ScriptEngines"
+
 [MRM]
     ;; Enables the Mini Region Modules Script Engine.
     ;; default is false
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index e78f25b..4c579c9 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -135,6 +135,10 @@
 
     meshing = Meshmerizer
     ;meshing = ZeroMesher
+    
+    ;; Path to decoded sculpty maps
+    ;; Defaults to "j2kDecodeCache
+    ;DecodedSculpMapPath = "j2kDecodeCache"
 
     ; Choose one of the physics engines below
     ; OpenDynamicsEngine is by some distance the most developed physics engine
@@ -1000,6 +1004,8 @@
     ; prims
     ; DisableUndergroundMovement = true
 
+    ;; Path to script assemblies 
+    ; ScriptEnginesPath = "ScriptEngines"
 
 [OpenGridProtocol]
     ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
-- 
cgit v1.1