diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-12 17:58:31 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-12 17:58:31 -0500 |
| commit | 7af2e9326537d2e57424367bd260744205fb76d8 (patch) | |
| tree | d7e033d1588b47db3632f9606a9eda894d739f41 /indra | |
| parent | a92c6ef67fbdef79e7163e1449616a15fd61b081 (diff) | |
EXT-2190 share button in IM should open sidepanel inventory
share button in im popup now opens sidepanel inventory.
Code reviewed by Seraph
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 1770138b3e..b2e05ccead 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -43,6 +43,7 @@ #include "llparticipantlist.h" #include "llimview.h" #include "llvoicechannel.h" +#include "llsidetray.h" void LLPanelChatControlPanel::onCallButtonClicked() { @@ -158,7 +159,8 @@ void LLPanelIMControlPanel::onAddFriendButtonClicked() void LLPanelIMControlPanel::onShareButtonClicked() { - // *TODO: Implement + LLSD key; + LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); } void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) |