aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-12-14 05:36:15 +0000
committerUbitUmarov2017-12-14 05:36:15 +0000
commit201c916670f9cd84347005523017049fb4275125 (patch)
treed6430f4e036455ab6f48ee6aa9e5ac95949767ec
parentmantis 8255 update example_web.xml (diff)
downloadopensim-SC_OLD-201c916670f9cd84347005523017049fb4275125.zip
opensim-SC_OLD-201c916670f9cd84347005523017049fb4275125.tar.gz
opensim-SC_OLD-201c916670f9cd84347005523017049fb4275125.tar.bz2
opensim-SC_OLD-201c916670f9cd84347005523017049fb4275125.tar.xz
add a missing return on a mesh decode error in ubOdemeshmerizer
-rw-r--r--OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index a2a3f79..032d4ed 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -340,7 +340,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
340 faces = new List<Face>(); 340 faces = new List<Face>();
341 OSD meshOsd = null; 341 OSD meshOsd = null;
342 342
343 if (primShape.SculptData.Length <= 0) 343 if (primShape.SculptData == null || primShape.SculptData.Length <= 0)
344 { 344 {
345// m_log.InfoFormat("[MESH]: asset data for {0} is zero length", primName); 345// m_log.InfoFormat("[MESH]: asset data for {0} is zero length", primName);
346 return false; 346 return false;
@@ -363,6 +363,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
363 catch (Exception e) 363 catch (Exception e)
364 { 364 {
365 m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString()); 365 m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
366 return false;
366 } 367 }
367 368
368 start = data.Position; 369 start = data.Position;