From 6363145f4556f3213f943637866445fae407593a Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 16 Feb 2012 17:19:53 -0800 Subject: EXP-1900 : Fix crash in filtering --- indra/newview/llinventoryfilter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) { -- cgit v1.2.3