aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDan Lake2011-04-29 15:49:10 -0700
committerDan Lake2011-04-29 15:49:10 -0700
commitd565041e163d3bb47d6f5e3b7432871ee24edc13 (patch)
tree1a802296d13c99c46c2d546d7d8cfc3dda44bf7e
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-d565041e163d3bb47d6f5e3b7432871ee24edc13.zip
opensim-SC_OLD-d565041e163d3bb47d6f5e3b7432871ee24edc13.tar.gz
opensim-SC_OLD-d565041e163d3bb47d6f5e3b7432871ee24edc13.tar.bz2
opensim-SC_OLD-d565041e163d3bb47d6f5e3b7432871ee24edc13.tar.xz
Fix crash when [Mesh] section is missing from configuration files
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs3
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 {