aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorMelanie2010-09-26 17:56:31 +0100
committerMelanie2010-09-26 17:56:31 +0100
commit6f689f591a295195cf8db3c37bcd382502d468d7 (patch)
tree87d7340eb92921c905a505cf89dd4a37d90ac381 /bin/OpenSimDefaults.ini
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.zip
opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.tar.gz
opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.tar.bz2
opensim-SC-6f689f591a295195cf8db3c37bcd382502d468d7.tar.xz
Merge Master
Diffstat (limited to '')
-rw-r--r--bin/OpenSimDefaults.ini6
1 files changed, 6 insertions, 0 deletions
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 @@
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
@@ -1000,6 +1004,8 @@
1000 ; prims 1004 ; prims
1001 ; DisableUndergroundMovement = true 1005 ; DisableUndergroundMovement = true
1002 1006
1007 ;; Path to script assemblies
1008 ; ScriptEnginesPath = "ScriptEngines"
1003 1009
1004[OpenGridProtocol] 1010[OpenGridProtocol]
1005 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. 1011 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..