From 416a46711df4dfe28a22bef47ef9c97aa96b061a Mon Sep 17 00:00:00 2001
From: andreykproductengine <none@none>
Date: Mon, 21 Nov 2016 22:58:07 +0200
Subject: MAINT-6901 safety checks fix

---
 indra/llprimitive/llmodel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 39ee550844..985ccee91e 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -200,7 +200,7 @@ void LLModel::normalizeModels(std::vector<LLPointer<LLModel > > model_list)
     {
         LLPointer<LLModel> model = *iter++;
 
-        if (model.get() && model->mVolumeFaces.empty())
+        if (model.notNull() && !model->mVolumeFaces.empty())
         {
             // For all of the volume faces
             // in the model, loop over
@@ -285,7 +285,7 @@ void LLModel::normalizeModels(std::vector<LLPointer<LLModel > > model_list)
     {
         LLPointer<LLModel> model = *iter++;
 
-        if (model->mVolumeFaces.empty())
+        if (model.isNull() || model->mVolumeFaces.empty())
         {
             continue;
         }
-- 
cgit v1.2.3