diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-28 10:23:03 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-28 10:23:03 -0700 |
| commit | 49209dfd7123515d76f9598149c1c724d0c0825a (patch) | |
| tree | 6637f56b9b25973739e597883ee3ebca3019088b /indra/newview/llimview.cpp | |
| parent | adc29e9b9f4d88cd6adfd27b3b516c069f84693c (diff) | |
| parent | 3fca4b0d61ad4534f26a8963ed6381a76e4f7c19 (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; |