aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-10-13 10:39:01 -0700
committerDiva Canto2010-10-13 10:39:01 -0700
commitd7c9bc3b1ceb6c0e8bd0202e4ca570b23e343af5 (patch)
treec1523707714229437feb4e48520a84d36d60c295
parentComment a debug message so that it doesn't spew the console upon encountering... (diff)
parentRemove carriage returns from OpenSimDefaults.ini. Correct one typo. Change (diff)
downloadopensim-SC_OLD-d7c9bc3b1ceb6c0e8bd0202e4ca570b23e343af5.zip
opensim-SC_OLD-d7c9bc3b1ceb6c0e8bd0202e4ca570b23e343af5.tar.gz
opensim-SC_OLD-d7c9bc3b1ceb6c0e8bd0202e4ca570b23e343af5.tar.bz2
opensim-SC_OLD-d7c9bc3b1ceb6c0e8bd0202e4ca570b23e343af5.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
-rw-r--r--bin/OpenSimDefaults.ini17
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 53d8ab7..05358c4 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -136,17 +136,16 @@
136 meshing = Meshmerizer 136 meshing = Meshmerizer
137 ;meshing = ZeroMesher 137 ;meshing = ZeroMesher
138 138
139 ;; Path to decoded sculpty maps 139 ; Path to decoded sculpty maps
140 ;; Defaults to "j2kDecodeCache 140 ; Defaults to "j2kDecodeCache
141 ;DecodedSculptMapPath = "j2kDecodeCache" 141 ;DecodedSculptMapPath = "j2kDecodeCache"
142 142
143 ;# {CacheSculptMaps} {Cache decoded sculpt maps?} {true false} true 143 ; if you use Meshmerizer and want sculpt map collisions, setting this to
144 ;; if you use Meshmerizer and want sculpt map collisions, setting this to 144 ; to true will store decoded sculpt maps in a special folder in your bin
145 ;; to true will store decoded sculpt maps in a special folder in your bin 145 ; folder, which can reduce startup times by reducing asset requests. Some
146 ;; folder, which can reduce startup times by reducing asset requests. Some 146 ; versions of mono dont work well when reading the cache files, so set this
147 ;; versions of mono dont work well when reading the cache files, so set this 147 ; to false if you have compatibility problems.
148 ;; to false if you have compatability problems. 148 ;CacheSculptMaps = true
149 ; CacheSculptMaps = true
150 149
151 ; Choose one of the physics engines below 150 ; Choose one of the physics engines below
152 ; OpenDynamicsEngine is by some distance the most developed physics engine 151 ; OpenDynamicsEngine is by some distance the most developed physics engine