From ae04a24e7a2b9fee4bfb4ac3ca894c06946fea17 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Mon, 15 Jan 2018 18:57:15 +0000
Subject: [PATCH] recover a lost null check

---
 OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index 451345f3b1..b694270320 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -340,7 +340,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
             faces = new List<Face>();
             OSD meshOsd = null;
 
-            if (primShape.SculptData.Length <= 0)
+            if (primShape.SculptData == null || primShape.SculptData.Length <= 0)
             {
 //                m_log.InfoFormat("[MESH]: asset data for {0} is zero length", primName);
                 return false;
@@ -363,6 +363,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                 catch (Exception e)
                 {
                     m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
+                    return false;
                 }
 
                 start = data.Position;