diff options
| author | Sean McNamara | 2011-05-02 02:23:18 -0400 |
|---|---|---|
| committer | Sean McNamara | 2011-05-02 02:23:18 -0400 |
| commit | fffd42f5cbbb9e59b6fde3247aeb0d80d990319f (patch) | |
| tree | 034b3e8da351954bc1124d91ec1f28e29e6a68c6 /OpenSim/Region/Physics | |
| parent | First pass at fixing justincc's feedback v2 ( http://opensimulator.org/mantis... (diff) | |
| parent | Fixed confusing OSDMap that comes as the response of QueryAccess in the case ... (diff) | |
| download | opensim-SC_OLD-fffd42f5cbbb9e59b6fde3247aeb0d80d990319f.zip opensim-SC_OLD-fffd42f5cbbb9e59b6fde3247aeb0d80d990319f.tar.gz opensim-SC_OLD-fffd42f5cbbb9e59b6fde3247aeb0d80d990319f.tar.bz2 opensim-SC_OLD-fffd42f5cbbb9e59b6fde3247aeb0d80d990319f.tar.xz | |
Merge git://opensimulator.org/git/opensim
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 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 | { |