summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-02-16 17:19:53 -0800
committerMerov Linden <merov@lindenlab.com>2012-02-16 17:19:53 -0800
commit6363145f4556f3213f943637866445fae407593a (patch)
tree3bb60385bc39ba5e55d07462a84867312e57b6cb /indra
parent155a171180be2df4500e7c6d03df3f99bf4231e7 (diff)
EXP-1900 : Fix crash in filtering
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llinventoryfilter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index f3d4667034..7b803888e2 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -317,7 +317,7 @@ bool LLInventoryFilter::checkAgainstClipboard(const LLUUID& object_id) const
{
LLUUID current_id = object_id;
LLInventoryObject *current_object = gInventory.getObject(object_id);
- while (current_id.notNull())
+ while (current_id.notNull() && current_object)
{
if (LLClipboard::getInstance()->isOnClipboard(current_id))
{