diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-05 12:42:58 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-05 12:42:58 -0800 |
| commit | 26998a5e387edca7d89159673c3dc8cd1a8d7539 (patch) | |
| tree | 38e9d740fe3336abc1770705f66db7c5bdf5043a /indra/newview/llinventoryfunctions.cpp | |
| parent | 263fd1345875eb0389e2ed0a8cbeb4e458a2d007 (diff) | |
EXP-1753 FIX -- Open Merchant Outbox floater when user selects copy to Merchant Outbox context menu option in Inventory
* Modified "copy to merchant outbox" and "move to merchant outbox" context menu actions to also open the merchant outbox floater
* Changed context menu behavior to always preserve disabled menu items on multiselect rather than occasionally ignoring it
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 6c5325620e..e8efac1ebf 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -530,6 +530,11 @@ void show_item_original(const LLUUID& item_uuid) } } +void open_outbox() +{ + LLFloaterReg::showInstance("outbox"); +} + void move_to_outbox_cb(const LLSD& notification, const LLSD& response) { S32 option = LLNotificationsUtil::getSelectedOption(notification, response); @@ -588,6 +593,8 @@ void move_to_outbox_cb(const LLSD& notification, const LLSD& response) parent = next_parent; } } + + open_outbox(); } } @@ -625,6 +632,8 @@ void copy_item_to_outbox(LLInventoryItem* inv_item, LLUUID dest_folder, const LL dest_folder, inv_item->getName(), LLPointer<LLInventoryCallback>(NULL)); + + open_outbox(); } else { @@ -682,11 +691,7 @@ void copy_folder_to_outbox(LLInventoryCategory* inv_cat, const LLUUID& dest_fold copy_folder_to_outbox(category, new_folder_id, top_level_folder); } - // delete the folder if we have emptied it - //if (cat_array->empty() && item_array->empty()) - //{ - // remove_category(inventory_model, inv_cat->getUUID()); - //} + open_outbox(); } ///---------------------------------------------------------------------------- |