diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-01 17:36:46 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-01 17:36:46 -0700 |
| commit | 1d6957ce09f92df6c0766162de1a84547f40e3bd (patch) | |
| tree | 34b15b0722b838702d1185b96b239a46a7fcc7c9 /indra/newview/llfloateroutbox.cpp | |
| parent | c6d981a8430f02a5a78afbeece9afeb7b2f108c8 (diff) | |
| parent | 898ec6cd362cd92ceef8dca8faf3fb8ed119b1be (diff) | |
merge of latest changes
Diffstat (limited to 'indra/newview/llfloateroutbox.cpp')
| -rw-r--r-- | indra/newview/llfloateroutbox.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index 04a55b261c..18ed36d0f3 100644 --- a/indra/newview/llfloateroutbox.cpp +++ b/indra/newview/llfloateroutbox.cpp @@ -174,9 +174,8 @@ void LLFloaterOutbox::onOpen(const LLSD& key) if (mOutboxId.isNull()) { const bool do_not_create_folder = false; - const bool do_not_find_in_library = false; - const LLUUID outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, do_not_create_folder, do_not_find_in_library); + const LLUUID outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, do_not_create_folder); if (outbox_id.isNull()) { @@ -252,7 +251,7 @@ void LLFloaterOutbox::setupOutbox(const LLUUID& outboxId) // Set the sort order newest to oldest mOutboxInventoryPanel->getFolderViewModel()->setSorter(LLInventoryFilter::SO_FOLDERS_BY_NAME); - mOutboxInventoryPanel->getFilter()->markDefault(); + mOutboxInventoryPanel->getFilter().markDefault(); fetchOutboxContents(); |