aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini6
1 files changed, 0 insertions, 6 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 26acac7..4c579c9 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1003,14 +1003,8 @@
1003 ; false to allow script controlled underground positioning of 1003 ; false to allow script controlled underground positioning of
1004 ; prims 1004 ; prims
1005 ; DisableUndergroundMovement = true 1005 ; DisableUndergroundMovement = true
1006<<<<<<< HEAD:bin/OpenSimDefaults.ini
1007 1006
1008 ; Path to script engine assemblies
1009 ; Default is ./bin/ScriptEngines
1010=======
1011
1012 ;; Path to script assemblies 1007 ;; Path to script assemblies
1013>>>>>>> 298b4c0... Some cleanup to OpenSimDefaults.ini:OpenSim/Region/Application/OpenSimDefaults.ini
1014 ; ScriptEnginesPath = "ScriptEngines" 1008 ; ScriptEnginesPath = "ScriptEngines"
1015 1009
1016[OpenGridProtocol] 1010[OpenGridProtocol]