diff options
author | andreykproductengine <none@none> | 2016-11-21 22:58:07 +0200 |
---|---|---|
committer | andreykproductengine <none@none> | 2016-11-21 22:58:07 +0200 |
commit | 416a46711df4dfe28a22bef47ef9c97aa96b061a (patch) | |
tree | 4624bb903df09f27affadb37b7758ed3b66d9118 /indra/llprimitive | |
parent | fb0355fdbae173c4c5720dd25334f9f5e5304fb2 (diff) |
MAINT-6901 safety checks fix
Diffstat (limited to 'indra/llprimitive')
-rw-r--r-- | indra/llprimitive/llmodel.cpp | 4 |
1 files 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; } |