From 8afa21cef0d138b2a85e218875b937d48edbc5d5 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 26 Sep 2010 00:21:28 -0400
Subject: Some cleanup to OpenSimDefaults.ini

	Fixing a couple of errors
---
 bin/OpenSimDefaults.ini | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 355c546..26acac7 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
@@ -999,9 +1003,14 @@
     ; false to allow script controlled underground positioning of
     ; prims
     ; DisableUndergroundMovement = true
+<<<<<<< HEAD:bin/OpenSimDefaults.ini
 
     ; Path to script engine assemblies
     ; Default is ./bin/ScriptEngines
+=======
+   
+    ;; Path to script assemblies 
+>>>>>>> 298b4c0... Some cleanup to OpenSimDefaults.ini:OpenSim/Region/Application/OpenSimDefaults.ini
     ; ScriptEnginesPath = "ScriptEngines"
 
 [OpenGridProtocol]
-- 
cgit v1.1