diff options
| author | Melanie | 2011-04-30 14:23:20 +0200 |
|---|---|---|
| committer | Melanie | 2011-04-30 14:23:20 +0200 |
| commit | 27891fddcf64df71570a7831dc75cac2b02b95b6 (patch) | |
| tree | 9c3848fe83b405b25cb08302ac3dd9c44b2331d6 /OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |
| parent | Set the attachment data on scripted rez to allow toasters to work. (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-27891fddcf64df71570a7831dc75cac2b02b95b6.zip opensim-SC-27891fddcf64df71570a7831dc75cac2b02b95b6.tar.gz opensim-SC-27891fddcf64df71570a7831dc75cac2b02b95b6.tar.bz2 opensim-SC-27891fddcf64df71570a7831dc75cac2b02b95b6.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')
| -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 64774d8..f89b824 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
| @@ -88,7 +88,8 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 88 | 88 | ||
| 89 | decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); | 89 | decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache"); |
| 90 | cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); | 90 | cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps); |
| 91 | useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); | 91 | if(mesh_config != null) |
| 92 | useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh); | ||
| 92 | 93 | ||
| 93 | try | 94 | try |
| 94 | { | 95 | { |