From ebd5da79b00ff16cba2dca7c630f08359878101f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 1 Jul 2010 18:10:36 -0400 Subject: EXT-8202 FIXED Crash when dragging an item into an object --- indra/newview/llinventoryfilter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 5daf819410..5dcf0680db 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -234,11 +234,12 @@ BOOL LLInventoryFilter::checkAgainstPermissions(const LLFolderViewItem* item) co BOOL LLInventoryFilter::checkAgainstFilterLinks(const LLFolderViewItem* item) const { const LLFolderViewEventListener* listener = item->getListener(); - if (!listener) return FALSE; + if (!listener) return TRUE; const LLUUID object_id = listener->getUUID(); const LLInventoryObject *object = gInventory.getObject(object_id); - if (!object) return FALSE; + if (!object) return TRUE; + const BOOL is_link = object->getIsLinkType(); if (is_link && (mFilterOps.mFilterLinks == FILTERLINK_EXCLUDE_LINKS)) return FALSE; -- cgit v1.2.3