OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

recover a lost null check

httptests
UbitUmarov 2018-01-15 18:57:15 +00:00
parent 6f3e538c79
commit ae04a24e7a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@ -340,7 +340,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
faces = new List<Face>(); faces = new List<Face>();
OSD meshOsd = null; 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); // m_log.InfoFormat("[MESH]: asset data for {0} is zero length", primName);
return false; return false;
@ -363,6 +363,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString()); m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
return false;
} }
start = data.Position; start = data.Position;