diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-01 16:55:19 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-01 16:55:19 -0400 |
| commit | ddf87b874a0841a65ec95d2d8ed4764412cd394c (patch) | |
| tree | 956fedc2cc55b74c3959b9f9c1a8de9c12206178 /indra/newview/llimview.cpp | |
| parent | 5cda3ccad729f21dee0ea5517be4dcd8304943fe (diff) | |
| parent | eed8e6adc93ed85ce9fe15f946fb4035672f6190 (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); |