diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-06-22 16:18:23 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-06-22 16:18:23 -0700 |
| commit | b84881382b265a7e4fad1b03dfb935992880ce70 (patch) | |
| tree | 2be1dc98b3c29e4745c79f6c0c6134a9598498a1 /indra/newview/llinventorybridge.cpp | |
| parent | 5999574c106d0d2566d191c754f6a630d8407787 (diff) | |
| parent | 4267014b146798cabe96568b2091c6bb2dd2b294 (diff) | |
merge and fixing linux build issues
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index f4670731ad..58579bdf4f 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -783,7 +783,14 @@ BOOL LLInvFVBridge::isCOFFolder() const BOOL LLInvFVBridge::isInboxFolder() const { - return gInventory.isObjectDescendentOf(mUUID, gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX)); + const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX, false, false); + + if (inbox_id.isNull()) + { + return FALSE; + } + + return gInventory.isObjectDescendentOf(mUUID, inbox_id); } BOOL LLInvFVBridge::isItemPermissive() const |