diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 09:54:19 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 09:54:19 -0800 |
commit | 05ae52a37f9f4d2519c40fe38f1b7143270c46ee (patch) | |
tree | ba3ea89cda34343550a909700f53ab18043a5d4a /indra/newview/llpanelimcontrolpanel.cpp | |
parent | e2e7d544b6a114e70e3b46f516a4f0e8d7db4bd1 (diff) | |
parent | 46b36d4fde4de97cd9960553ea77a64fbbe34b6a (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.cpp')
-rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 40319d949d..fa6d16cfb1 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -160,13 +160,7 @@ void LLPanelIMControlPanel::onAddFriendButtonClicked() 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); - } + LLAvatarActions::share(mAvatarID); } void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) |