summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2016-02-18 11:36:05 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2016-02-18 11:36:05 +0200
commit145aa1d0740e74aa98f7809dd1f2668b0546a131 (patch)
tree69fb8419a6843173718d8794881049a625e8cb64 /indra/newview/llinventorymodel.cpp
parent50f9e4b308b83a9751d2837e09445c944bdc2a85 (diff)
MAINT-6119 Viewer needs a few NULL uuid checks
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rwxr-xr-xindra/newview/llinventorymodel.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index e123a3e68a..1ae8fc418f 100755
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3418,6 +3418,11 @@ void LLInventoryModel::removeCategory(const LLUUID& category_id)
void LLInventoryModel::removeObject(const LLUUID& object_id)
{
+ if(object_id.isNull())
+ {
+ return;
+ }
+
LLInventoryObject* obj = getObject(object_id);
if (dynamic_cast<LLViewerInventoryItem*>(obj))
{