diff options
| author | Diva Canto | 2011-04-29 15:52:40 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-04-29 15:52:40 -0700 |
| commit | 412503b21631da9a8d90e786567ac282d0d1e774 (patch) | |
| tree | 3ea6639ce49d7a7733fe68b150e1d65864f52055 /OpenSim/Region | |
| parent | Remove the scripts of the attachments in the departing region and recreate th... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-412503b21631da9a8d90e786567ac282d0d1e774.zip opensim-SC_OLD-412503b21631da9a8d90e786567ac282d0d1e774.tar.gz opensim-SC_OLD-412503b21631da9a8d90e786567ac282d0d1e774.tar.bz2 opensim-SC_OLD-412503b21631da9a8d90e786567ac282d0d1e774.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -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 | { |