diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-06 11:30:27 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-06 11:30:27 -0500 |
| commit | 97a92deb18d09e030c0800107204d9776a3c6229 (patch) | |
| tree | 16133351b0822937c5da1e7009e80e3157119d59 /indra/newview/llviewermessage.cpp | |
| parent | ae2a1ea9f10dc9bf3cc5ef59f1428ea1e5fa6495 (diff) | |
| parent | 95850eddfd26e85dcfa1dd6f71233b6e0bf08253 (diff) | |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rwxr-xr-x[-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..100755 --- 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); } } |