diff options
| author | Richard Linden <none@none> | 2011-11-10 10:58:11 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-10 10:58:11 -0800 |
| commit | b2fffa74f7fbafba927b731f38681379dfa7c980 (patch) | |
| tree | 00a3dc5d6db3b3cb479a2e3634f599fbcceb14b8 /indra/newview/llviewermessage.cpp | |
| parent | 5fa125ea0b733b3729208d90777d260db5e331e8 (diff) | |
| parent | 55d282941454199608b15123f0420a1e8c8d0807 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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 7cae19a1d2..dca5cdd06d 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); } } |