diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-25 19:08:21 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-25 19:08:21 +0100 |
| commit | df1dae8a6d6410fd25e985515b62f931b24ee3a9 (patch) | |
| tree | 831a2c815fe4ec811108e7cebd9471db10b9a5ae /indra/newview/llimview.cpp | |
| parent | daabe1fb133d69df938bb58d12f0be26bdc16ead (diff) | |
| parent | 2112f333bd07fa9e036bb4c2745a7199e4025e73 (diff) | |
merge from PE's viewer-release
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; |