diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-13 09:35:37 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-13 09:35:37 -0500 |
commit | f36c43abde7457747539f3687e02bd54a88bcd87 (patch) | |
tree | f42d5e80a19782e7a75d45e144e6f9930ba0aff2 /indra/newview/llpanelimcontrolpanel.cpp | |
parent | 22a20bfecf401912be2fda2ce644112440dcc90f (diff) | |
parent | 31ceac828920bac39c330ba1eb6b7f7d9cc918b1 (diff) |
branch merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
-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) |