diff options
author | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
commit | 4adada6fe48a960850639628c0f90e55c848235f (patch) | |
tree | 63f616d32f35012fe278a8cdeb9b3e762ecde37a /bin | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-4adada6fe48a960850639628c0f90e55c848235f.zip opensim-SC-4adada6fe48a960850639628c0f90e55c848235f.tar.gz opensim-SC-4adada6fe48a960850639628c0f90e55c848235f.tar.bz2 opensim-SC-4adada6fe48a960850639628c0f90e55c848235f.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.ini.example | 5 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 1625de0..9d34854 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -13,7 +13,10 @@ | |||
13 | ;; An empty question will set the default if the dependencies are | 13 | ;; An empty question will set the default if the dependencies are |
14 | ;; satisfied. | 14 | ;; satisfied. |
15 | ;; | 15 | ;; |
16 | ;; ; denotes a commented option. It is ignored. | 16 | ;; ; denotes a commented out option. Uncomment it to actvate it |
17 | ;; and change it to the desired value | ||
18 | ;; Any options added to OpenSim.ini.exmaple must be commented out, | ||
19 | ;; and their value must represent the default. | ||
17 | 20 | ||
18 | [Startup] | 21 | [Startup] |
19 | ;# {save_crashes} {} {Save crashes to disk?} {true false} false | 22 | ;# {save_crashes} {} {Save crashes to disk?} {true false} false |
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 |