diff options
author | Richard Linden <none@none> | 2012-07-30 15:16:15 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-07-30 15:16:15 -0700 |
commit | de4b362839adbac123010b294e5c52fad90965b3 (patch) | |
tree | a0d93ce497784ab744412a8eb76f74223163de71 /indra/newview/llsidepanelinventory.cpp | |
parent | 9fa3407c9c18e0e9592bd659a515ec0b77ba13bd (diff) | |
parent | f29bdc27b3038a19317095ef914bd560f3199d28 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
-rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index 47bd620fc6..acb232c77f 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -260,9 +260,8 @@ void LLSidepanelInventory::updateInbox() // const bool do_not_create_folder = false; - const bool do_not_find_in_library = false; - const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX, do_not_create_folder, do_not_find_in_library); + const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX, do_not_create_folder); // Set up observer to listen for creation of inbox if at least one of them doesn't exist if (inbox_id.isNull()) |