diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-06-22 14:28:19 -0400 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-06-22 14:28:19 -0400 |
| commit | 8737446eb737bc26dcb1ac9462cc060baef0e13f (patch) | |
| tree | fb085ee30d8058975b93839f59e4683265e0341a | |
| parent | 57017a7a6e65c885b6124849fd5da3eae68717f8 (diff) | |
EXP-919 FIX -- Toggling InventoryDisplayInbox value to True in Viewer on Agni creates Inbox and Outbox system folders
* The code should no longer create these folders when querying for them.
Reviewed by Richard
| -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 |