diff options
| author | Melanie | 2010-10-09 01:07:41 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-09 01:07:41 +0100 |
| commit | 231feab57ff1e6d92388b75645382c865e65dea2 (patch) | |
| tree | 014c2218919051fdbb995c844ebb322145e1c36b /OpenSim/Region/Physics | |
| parent | Fix a security relevant issue with take / take copy (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.zip opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.tar.gz opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.tar.bz2 opensim-SC_OLD-231feab57ff1e6d92388b75645382c865e65dea2.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 3 |
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 | { |