From b0fdc4495153523ff417334499ca466b0d8987c8 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 22 Jun 2011 16:08:23 -0500
Subject: SH-1815 Fix for crash when using old version slm
---
indra/llprimitive/llmodel.cpp | 5 +++++
indra/newview/llfloatermodelpreview.cpp | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
(limited to 'indra')
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 8f2f24b747..f2fe20b3e7 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1784,6 +1784,7 @@ bool LLModel::loadModel(std::istream& is)
if (header[nm[lod]]["offset"].asInteger() == -1 ||
header[nm[lod]]["size"].asInteger() == 0 )
{ //cannot load requested LOD
+ llwarns << "LoD data is invalid!" << llendl;
return false;
}
@@ -1844,6 +1845,10 @@ bool LLModel::loadModel(std::istream& is)
}
return true;
}
+ else
+ {
+ llwarns << "unpackVolumeFaces failed!" << llendl;
+ }
return false;
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 1c48795ea7..77713b6ebb 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1970,7 +1970,7 @@ bool LLModelLoader::loadFromSLM(const std::string& filename)
}
else
{
- llassert(model[lod].empty());
+ return false;
}
}
}
--
cgit v1.2.3