diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-01 15:47:19 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-01 15:47:19 +0100 |
| commit | 9cef95ca2bf8a7194c6ce80ba744d9c936695e86 (patch) | |
| tree | 92961b4a9ff5cf9aabede13180a0e88eed10834d /indra/newview/llimview.cpp | |
| parent | 47ace2fc41d09aef6d8fded281a4a2da765bef86 (diff) | |
| parent | 87a4890312c7bc5671d7d122e9d1f4ec1795d2dd (diff) | |
merge
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 6d3998bb96..a2b72e7d74 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1929,9 +1929,9 @@ BOOL LLIncomingCallDialog::postBuild() mLifetimeTimer.stop(); } - //it's not possible to connect to existing Ad-Hoc chat through incoming ad-hoc call + //it's not possible to connect to existing Ad-Hoc/Group chat through incoming ad-hoc call //and no IM for avaline - childSetVisible("Start IM", is_avatar && notify_box_type != "VoiceInviteAdHoc"); + childSetVisible("Start IM", is_avatar && notify_box_type != "VoiceInviteAdHoc" && notify_box_type != "VoiceInviteGroup"); setCanDrag(FALSE); |