From a4375f8a3023912bbb11e8c76ef574807dc1afde Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Thu, 12 Nov 2009 15:46:51 +0000 Subject: DEV-41324 DEV-41331: Improvements to the Avaline voice workflow. Don't show the "Start IM" button in the incoming call request for an Avaline call. And display the phone number of the incoming call as the avatar name, instead of "(???) (???)". --- indra/newview/llpanelimcontrolpanel.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'indra/newview/llpanelimcontrolpanel.cpp') diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 1770138b3e..9cd949c9cc 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -174,10 +174,8 @@ void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) getChild("avatar_icon")->setValue(mAvatarID); - // Fetch the currect name - gCacheName->get(mAvatarID, FALSE, boost::bind(&LLPanelIMControlPanel::nameUpdatedCallback, this, _1, _2, _3, _4)); - - // Disable profile button if participant is not realy SL avatar + // Disable most profile buttons if the participant is + // not really an SL avatar (e.g., an Avaline caller). LLIMModel::LLIMSession* im_session = im_model.findIMSession(session_id); if( im_session && !im_session->mOtherParticipantIsAvatar ) @@ -188,6 +186,13 @@ void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) childSetEnabled("share_btn", FALSE); childSetEnabled("teleport_btn", FALSE); childSetEnabled("pay_btn", FALSE); + + getChild("avatar_name")->setValue(im_session->mName); + } + else + { + // If the participant is an avatar, fetch the currect name + gCacheName->get(mAvatarID, FALSE, boost::bind(&LLPanelIMControlPanel::nameUpdatedCallback, this, _1, _2, _3, _4)); } } -- cgit v1.2.3 From 7af2e9326537d2e57424367bd260744205fb76d8 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 12 Nov 2009 17:58:31 -0500 Subject: EXT-2190 share button in IM should open sidepanel inventory share button in im popup now opens sidepanel inventory. Code reviewed by Seraph --- indra/newview/llpanelimcontrolpanel.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llpanelimcontrolpanel.cpp') 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) -- cgit v1.2.3 From 30a2cf81e5fb7ac0a21c35e599c8b80e2b3a35e1 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 18 Nov 2009 18:59:12 +0200 Subject: implemented normal task EXT-2519 Share button in IM should put 'Drag items from inventory here' in IM window --HG-- branch : product-engine --- indra/newview/llpanelimcontrolpanel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llpanelimcontrolpanel.cpp') 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) -- cgit v1.2.3 From 699eac4ee37b31da78af2323ed15a47e6b386930 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 18 Nov 2009 17:52:03 -0800 Subject: Switch some files to Unix line endings --- indra/newview/llpanelimcontrolpanel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelimcontrolpanel.cpp') diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 5e23662a0b..40319d949d 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -195,7 +195,7 @@ void LLPanelIMControlPanel::setSessionId(const LLUUID& session_id) childSetEnabled("teleport_btn", FALSE); childSetEnabled("pay_btn", FALSE); - getChild("avatar_name")->setValue(im_session->mName); + getChild("avatar_name")->setValue(im_session->mName); } else { -- cgit v1.2.3