diff options
| author | Melanie | 2010-10-10 22:07:51 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-10 22:07:51 +0100 |
| commit | 30f926aab6c564f76491d5de130bde3f9e5b738d (patch) | |
| tree | 1b984f37ce568503de8da1bdfabe3013a53f9ed4 /OpenSim/Region/Physics | |
| parent | Change the part for sound playback to be the root part / object UUID instead (diff) | |
| parent | * Make line endings consistant in Meshmerizer.cs (diff) | |
| download | opensim-SC_OLD-30f926aab6c564f76491d5de130bde3f9e5b738d.zip opensim-SC_OLD-30f926aab6c564f76491d5de130bde3f9e5b738d.tar.gz opensim-SC_OLD-30f926aab6c564f76491d5de130bde3f9e5b738d.tar.bz2 opensim-SC_OLD-30f926aab6c564f76491d5de130bde3f9e5b738d.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index c97db8c..cf57c0a 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
| @@ -81,7 +81,7 @@ 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 | cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); |
| 86 | 86 | ||
| 87 | try | 87 | try |