summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2012-03-13 15:05:51 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2012-03-13 15:05:51 +0200
commit1c51271d56c0332394fb23dc843aecf812f6f901 (patch)
treef3ffb19b8acd5068381b2b885334dca8376f0618 /indra/newview
parentbea2dfbc22bb2d80755dcf9daf810e1ea0329c2d (diff)
CHUI-56 FIXED Fixed a crash when deleting multiple inventory folders.
Diffstat (limited to 'indra/newview')
-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 ef58e4fa21..da85c81cf2 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -396,7 +396,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.