aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bin/OpenSimDefaults.ini9
1 files changed, 9 insertions, 0 deletions
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 @@
135 135
136 meshing = Meshmerizer 136 meshing = Meshmerizer
137 ;meshing = ZeroMesher 137 ;meshing = ZeroMesher
138
139 ;; Path to decoded sculpty maps
140 ;; Defaults to "j2kDecodeCache
141 ;DecodedSculpMapPath = "j2kDecodeCache"
138 142
139 ; Choose one of the physics engines below 143 ; Choose one of the physics engines below
140 ; OpenDynamicsEngine is by some distance the most developed physics engine 144 ; OpenDynamicsEngine is by some distance the most developed physics engine
@@ -999,9 +1003,14 @@
999 ; false to allow script controlled underground positioning of 1003 ; false to allow script controlled underground positioning of
1000 ; prims 1004 ; prims
1001 ; DisableUndergroundMovement = true 1005 ; DisableUndergroundMovement = true
1006<<<<<<< HEAD:bin/OpenSimDefaults.ini
1002 1007
1003 ; Path to script engine assemblies 1008 ; Path to script engine assemblies
1004 ; Default is ./bin/ScriptEngines 1009 ; Default is ./bin/ScriptEngines
1010=======
1011
1012 ;; Path to script assemblies
1013>>>>>>> 298b4c0... Some cleanup to OpenSimDefaults.ini:OpenSim/Region/Application/OpenSimDefaults.ini
1005 ; ScriptEnginesPath = "ScriptEngines" 1014 ; ScriptEnginesPath = "ScriptEngines"
1006 1015
1007[OpenGridProtocol] 1016[OpenGridProtocol]