aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-10-08 03:09:04 +0100
committerMelanie2010-10-08 03:09:04 +0100
commit1e66f79a4e71977c621feac359f60e83f7152d1f (patch)
tree31ab483d62fe256a6ce76ce0d5ac0df366e61318
parentClarify the format comment at the top of OpenSim.ini.example (diff)
parentmove CacheSculptMaps ini flag to OpenSimDefaults.ini (diff)
downloadopensim-SC_OLD-1e66f79a4e71977c621feac359f60e83f7152d1f.zip
opensim-SC_OLD-1e66f79a4e71977c621feac359f60e83f7152d1f.tar.gz
opensim-SC_OLD-1e66f79a4e71977c621feac359f60e83f7152d1f.tar.bz2
opensim-SC_OLD-1e66f79a4e71977c621feac359f60e83f7152d1f.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--bin/OpenSim.ini.example8
-rw-r--r--bin/OpenSimDefaults.ini10
2 files changed, 9 insertions, 9 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 62ce451..9d34854 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -133,14 +133,6 @@
133 ;; Usually this is only a box. 133 ;; Usually this is only a box.
134 ; meshing = Meshmerizer 134 ; meshing = Meshmerizer
135 ; meshing = ZeroMesher 135 ; meshing = ZeroMesher
136
137 ;# {CacheSculptMaps} {Cache decoded sculpt maps?} {true false} true
138 ;; if you use Meshmerizer and want sculpt map collisions, setting this to
139 ;; to true will store decoded sculpt maps in a special folder in your bin
140 ;; folder, which can reduce startup times by reducing asset requests. Some
141 ;; versions of mono dont work well when reading the cache files, so set this
142 ;; to false if you have compatability problems.
143 CacheSculptMaps = false
144 136
145 ;; Choose one of the physics engines below 137 ;; Choose one of the physics engines below
146 ;; OpenDynamicsEngine is by some distance the most developed physics engine 138 ;; OpenDynamicsEngine is by some distance the most developed physics engine
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index f939cc8..53d8ab7 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -139,7 +139,15 @@
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
144 ;; if you use Meshmerizer and want sculpt map collisions, setting this to
145 ;; to true will store decoded sculpt maps in a special folder in your bin
146 ;; folder, which can reduce startup times by reducing asset requests. Some
147 ;; versions of mono dont work well when reading the cache files, so set this
148 ;; to false if you have compatability problems.
149 ; CacheSculptMaps = true
150
143 ; Choose one of the physics engines below 151 ; Choose one of the physics engines below
144 ; OpenDynamicsEngine is by some distance the most developed physics engine 152 ; OpenDynamicsEngine is by some distance the most developed physics engine
145 ; basicphysics effectively does not model physics at all, making all objects phantom 153 ; basicphysics effectively does not model physics at all, making all objects phantom