aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordahlia2010-10-07 19:34:46 -0700
committerdahlia2010-10-07 19:34:46 -0700
commit9391c3ffee4fb722657ebb064f8ba02f1d1f8802 (patch)
tree29ac369393e203477bc29bc645c0572b6db327a6
parentFix autoreturn to not return zero objects (diff)
downloadopensim-SC-9391c3ffee4fb722657ebb064f8ba02f1d1f8802.zip
opensim-SC-9391c3ffee4fb722657ebb064f8ba02f1d1f8802.tar.gz
opensim-SC-9391c3ffee4fb722657ebb064f8ba02f1d1f8802.tar.bz2
opensim-SC-9391c3ffee4fb722657ebb064f8ba02f1d1f8802.tar.xz
add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs3
-rw-r--r--bin/OpenSim.ini.example8
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 20a5bb4..c97db8c 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -81,7 +81,8 @@ namespace OpenSim.Region.Physics.Meshing
81 { 81 {
82 IConfig start_config = config.Configs["Startup"]; 82 IConfig start_config = config.Configs["Startup"];
83 83
84 decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); 84 decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
85 cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
85 86
86 try 87 try
87 { 88 {
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1625de0..91f6068 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -130,6 +130,14 @@
130 ;; Usually this is only a box. 130 ;; Usually this is only a box.
131 ; meshing = Meshmerizer 131 ; meshing = Meshmerizer
132 ; meshing = ZeroMesher 132 ; meshing = ZeroMesher
133
134 ;# {CacheSculptMaps} {Cache decoded sculpt maps?} {true false} true
135 ;; if you use Meshmerizer and want sculpt map collisions, setting this to
136 ;; to true will store decoded sculpt maps in a special folder in your bin
137 ;; folder, which can reduce startup times by reducing asset requests. Some
138 ;; versions of mono dont work well when reading the cache files, so set this
139 ;; to false if you have compatability problems.
140 CacheSculptMaps = false
133 141
134 ;; Choose one of the physics engines below 142 ;; Choose one of the physics engines below
135 ;; OpenDynamicsEngine is by some distance the most developed physics engine 143 ;; OpenDynamicsEngine is by some distance the most developed physics engine