aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-10-13 20:29:55 -0400
committerTeravus Ovares (Dan Olivares)2010-10-13 20:29:55 -0400
commit46738bbd168873cdd73010165c120a5f8b96f3d3 (patch)
treec9668a82a06ec1577855b675f1f483ec7d871fba /bin
parent* Normalizing endlines so git stops complaining about them being inconsistent. (diff)
parentAdded SOP.MediaUrl and Shape.Media to the deserialization (diff)
downloadopensim-SC_OLD-46738bbd168873cdd73010165c120a5f8b96f3d3.zip
opensim-SC_OLD-46738bbd168873cdd73010165c120a5f8b96f3d3.tar.gz
opensim-SC_OLD-46738bbd168873cdd73010165c120a5f8b96f3d3.tar.bz2
opensim-SC_OLD-46738bbd168873cdd73010165c120a5f8b96f3d3.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Conflicts: bin/OpenSimDefaults.ini
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini17
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9c63118..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