diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-01 18:10:36 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-01 18:10:36 -0400 |
| commit | ebd5da79b00ff16cba2dca7c630f08359878101f (patch) | |
| tree | b44de789fe7f82ba7bd27e203ad1ab67eeb7fc21 | |
| parent | cbcf080f2d566f6dd524354206efd7c2a3b1f6b4 (diff) | |
EXT-8202 FIXED Crash when dragging an item into an object
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 5 |
1 files 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; |