diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-29 16:09:08 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-29 16:09:08 -0400 |
| commit | 125b789239b5adb5f810b3586a95f5d5f8a17c40 (patch) | |
| tree | 9650173fc466d363a9092722d04456c15b078f8d /indra/newview/llimview.cpp | |
| parent | 17d2a3b9fb24ea56eb5e70007a2502bbef436a65 (diff) | |
| parent | 33065ed28835f17aed22bd0d5f742bc5bb76e1a4 (diff) | |
merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files 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; |