diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-16 16:28:04 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-16 16:28:04 +0200 |
commit | eef22e0baf9e62f8c38058ad22e6e6bd5e5aca26 (patch) | |
tree | 2a498eb73a80802c7811193ce63253c9be905295 /indra/newview/llpanelimcontrolpanel.cpp | |
parent | 59d575fe615bf14a10056c9b9fe0c109ec2c103e (diff) | |
parent | bd42c1ae2cd6bb6e005478cc121c2b5d7a844eb4 (diff) |
Merge from default branch
--HG--
branch : product-engine
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 9cd949c9cc..00502341fc 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) |