diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-01 07:03:09 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-01 07:03:09 -0700 |
| commit | fc9958a61854313d80a562e18555d2c63cc4bfe5 (patch) | |
| tree | 5d1c1617a60733defa424232e8bef15971b03b72 /indra/newview/llimview.cpp | |
| parent | 67f0a792a286546b7213666d337b394517342394 (diff) | |
| parent | af4a85009011119e7787e2b30416919117edccf9 (diff) | |
Merged from viewer-release
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); |