aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-07 23:47:39 -0400
committerJonathan Freedman2010-10-07 23:47:39 -0400
commit4adada6fe48a960850639628c0f90e55c848235f (patch)
tree63f616d32f35012fe278a8cdeb9b3e762ecde37a /OpenSim/Region/Physics/Meshing
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.zip
opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.gz
opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.bz2
opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Meshing')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs3
1 files changed, 2 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 {