diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-07 14:43:59 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-07 14:43:59 -0800 |
| commit | 5dcdb2dd02ac7e7626e03ab7b4f4bb0aaad72742 (patch) | |
| tree | b7087b295830e5481840e31ce31ba7c43e48ef96 /indra/newview/llviewermessage.cpp | |
| parent | 32dca99fe59196fa4a92a815b441b4e6e9f747f0 (diff) | |
EXP-1548 FIX -- Clicking show on inventory offer does not open inventory (or received items panel) on test grid Ravi set to use Received Items folder for transfers
EXP-1555 FIX -- Double-click is inconsistent between inventory and Received Items
EXP-1547 FIX -- drag/drop inventory to agent - delivers to Objects, not Received items.
* "Show" button from p2p transfer now opens inventory window and inbox panel, setting focus to the item
* Double-click on inbox inventory items now falls through to default item behavior
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index a9ca70fd26..68dd07877b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1256,14 +1256,7 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam const BOOL auto_open = gSavedSettings.getBOOL("ShowInInventory") && // don't open if showininventory is false !from_name.empty(); // don't open if it's not from anyone. - LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(auto_open); - if(active_panel) - { - LL_DEBUGS("Messaging") << "Highlighting" << obj_id << LL_ENDL; - LLFocusableElement* focus_ctrl = gFocusMgr.getKeyboardFocus(); - active_panel->setSelection(obj_id, TAKE_FOCUS_NO); - gFocusMgr.setKeyboardFocus(focus_ctrl); - } + LLInventoryPanel::openInventoryPanelAndSetSelection(auto_open, obj_id); } } |