diff options
author | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
commit | 6e5f529a7adb53fa021986aed6e6b1b229cc0efd (patch) | |
tree | a031044cfb6618a5b36a0e80d0fc3a918dfa07a9 /indra/newview/llpanelimcontrolpanel.cpp | |
parent | a35fbddb910fa0dd068622c3dc64af1b27ca19b7 (diff) | |
parent | 81eca4a7823f7fa06327b8185b6603d1f3c9ac9a (diff) |
branch merge
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
-rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 00502341fc..5e23662a0b 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -44,6 +44,7 @@ #include "llimview.h" #include "llvoicechannel.h" #include "llsidetray.h" +#include "lltrans.h" void LLPanelChatControlPanel::onCallButtonClicked() { @@ -161,6 +162,11 @@ void LLPanelIMControlPanel::onShareButtonClicked() { LLSD key; LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); + + if (gIMMgr->hasSession(getSessionId())) + { + LLIMModel::getInstance()->addMessage(getSessionId(), SYSTEM_FROM, LLUUID::null, LLTrans::getString("share_alert"), false); + } } void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) |