aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDan Lake2011-04-29 15:49:10 -0700
committerJustin Clark-Casey (justincc)2011-05-04 19:35:36 +0100
commita4aa2e274bad5fbdc6afb8b9b0d5bc227be35332 (patch)
treee9f4493aa6125bfe1c5121bf7e0cc0f420a6a66f
parentIncreased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien a... (diff)
downloadopensim-SC_OLD-a4aa2e274bad5fbdc6afb8b9b0d5bc227be35332.zip
opensim-SC_OLD-a4aa2e274bad5fbdc6afb8b9b0d5bc227be35332.tar.gz
opensim-SC_OLD-a4aa2e274bad5fbdc6afb8b9b0d5bc227be35332.tar.bz2
opensim-SC_OLD-a4aa2e274bad5fbdc6afb8b9b0d5bc227be35332.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 {