aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-09-26 23:57:06 +0100
committerMelanie2010-09-26 23:57:06 +0100
commit9f17ae580dd2c6000c1f90ad83bb00e1ba097666 (patch)
treefa2fed00e1f2d54150822019caa03ee6dab7e73f /bin
parentTypo fixes (diff)
parentWhen receiving intersim IM, don't let the spoof protection bomb (diff)
downloadopensim-SC-9f17ae580dd2c6000c1f90ad83bb00e1ba097666.zip
opensim-SC-9f17ae580dd2c6000c1f90ad83bb00e1ba097666.tar.gz
opensim-SC-9f17ae580dd2c6000c1f90ad83bb00e1ba097666.tar.bz2
opensim-SC-9f17ae580dd2c6000c1f90ad83bb00e1ba097666.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 4c579c9..f939cc8 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -138,7 +138,7 @@
138 138
139 ;; Path to decoded sculpty maps 139 ;; Path to decoded sculpty maps
140 ;; Defaults to "j2kDecodeCache 140 ;; Defaults to "j2kDecodeCache
141 ;DecodedSculpMapPath = "j2kDecodeCache" 141 ;DecodedSculptMapPath = "j2kDecodeCache"
142 142
143 ; Choose one of the physics engines below 143 ; Choose one of the physics engines below
144 ; OpenDynamicsEngine is by some distance the most developed physics engine 144 ; OpenDynamicsEngine is by some distance the most developed physics engine