From 2112f333bd07fa9e036bb4c2745a7199e4025e73 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Fri, 25 Jun 2010 19:43:03 +0300 Subject: EXT-4872 FIXED hiding Start IM button for ad-hoc call invitation Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/658/ --HG-- branch : product-engine --- indra/newview/llimview.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index ddfcd68e38..6d3998bb96 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1898,8 +1898,6 @@ BOOL LLIncomingCallDialog::postBuild() // check to see if this is an Avaline call bool is_avatar = LLVoiceClient::getInstance()->isParticipantAvatar(session_id); - childSetVisible("Start IM", is_avatar); // no IM for avaline - if (caller_name == "anonymous") { caller_name = getString("anonymous"); @@ -1931,6 +1929,10 @@ BOOL LLIncomingCallDialog::postBuild() mLifetimeTimer.stop(); } + //it's not possible to connect to existing Ad-Hoc chat through incoming ad-hoc call + //and no IM for avaline + childSetVisible("Start IM", is_avatar && notify_box_type != "VoiceInviteAdHoc"); + setCanDrag(FALSE); return TRUE; -- cgit v1.2.3