aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorBlueWall2011-04-21 15:16:12 -0400
committerBlueWall2011-04-21 15:16:12 -0400
commit5e99d9365148fc6d10633e62efbfcc0ab3beaaca (patch)
tree50f9511dc1a317047d9262e380b64cddbe09ffab /bin/OpenSimDefaults.ini
parentGroup collada meshies settings under [Mesh] in OpensimDefaults.ini (diff)
parentRemove duplicated freeswitch settings. (diff)
downloadopensim-SC_OLD-5e99d9365148fc6d10633e62efbfcc0ab3beaaca.zip
opensim-SC_OLD-5e99d9365148fc6d10633e62efbfcc0ab3beaaca.tar.gz
opensim-SC_OLD-5e99d9365148fc6d10633e62efbfcc0ab3beaaca.tar.bz2
opensim-SC_OLD-5e99d9365148fc6d10633e62efbfcc0ab3beaaca.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index b134b7e..2521c6c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -453,7 +453,7 @@
453[Mesh] 453[Mesh]
454 ; enable / disable Collada mesh support 454 ; enable / disable Collada mesh support
455 ; default is true 455 ; default is true
456 ; ColladaMesh = true 456 ColladaMesh = true
457 457
458 ; if you use Meshmerizer and want collisions for meshies, setting this to true 458 ; if you use Meshmerizer and want collisions for meshies, setting this to true
459 ; will cause OpenSim to attempt to decode meshies assets, extract the physics 459 ; will cause OpenSim to attempt to decode meshies assets, extract the physics