summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-03-16 13:43:42 -0700
committerMerov Linden <merov@lindenlab.com>2012-03-16 13:43:42 -0700
commit356c29c888e6220915a0f050c393c7e91d922318 (patch)
treebfc9061cf3e66d232a9b7bc5a940afce02e6d7c1 /indra/newview/llinventorybridge.cpp
parentf4722686d4bd125ebbecac5da511390252a7084e (diff)
parent34c599858bd64b7fbda767ff9c9f7d8bcd2c2c25 (diff)
EXP-1841 : pull from current viewer-experience.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 03f6a31c6d..9b8c311d16 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -446,7 +446,11 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
for(; it != end; ++it)
{
gInventory.moveObject((*it), trash_id);
- model->updateItem(gInventory.getItem(*it));
+ LLViewerInventoryItem* item = gInventory.getItem(*it);
+ if (item)
+ {
+ model->updateItem(item);
+ }
}
// notify inventory observers.