diff options
author | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 09:36:14 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 09:36:14 -0800 |
commit | 577479a3e53ef152da191e3a004aeb34f0815658 (patch) | |
tree | 92750fad9e0e2ee7ee892df4ec06926a21d75527 /indra/newview/llinventoryfunctions.cpp | |
parent | 6b919e324e55ebcac0e2d33ca44a05fae9ac1d42 (diff) |
EXP-1803 CLEAN-UP -- Modified code to use the "unique" tag on the notification.
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index f5be271a68..40bc3b76c9 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -533,7 +533,6 @@ void show_item_original(const LLUUID& item_uuid) } -static S32 create_folder_in_outbox_operation_id = -1; static S32 move_to_outbox_operation_id = -1; static std::list<LLSD> move_to_outbox_payloads; @@ -542,11 +541,6 @@ void open_outbox() LLFloaterReg::showInstance("outbox"); } -void folder_created_in_outbox_cb(const LLSD& notification, const LLSD& response) -{ - create_folder_in_outbox_operation_id = -1; -} - LLUUID create_folder_in_outbox_for_item(LLInventoryItem* item, const LLUUID& destFolderId, S32 operation_id) { llassert(item); @@ -555,12 +549,7 @@ LLUUID create_folder_in_outbox_for_item(LLInventoryItem* item, const LLUUID& des LLUUID created_folder_id = gInventory.createNewCategory(destFolderId, LLFolderType::FT_NONE, item->getName()); gInventory.notifyObservers(); - if (create_folder_in_outbox_operation_id != operation_id) - { - LLNotificationsUtil::add("OutboxFolderCreated", LLSD(), LLSD(), boost::bind(&folder_created_in_outbox_cb, _1, _2)); - - create_folder_in_outbox_operation_id = operation_id; - } + LLNotificationsUtil::add("OutboxFolderCreated"); return created_folder_id; } |