diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-02 16:26:43 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-02 16:26:43 +0300 |
| commit | 15561d0d540df27426c0cae1837ac42c3cb83a56 (patch) | |
| tree | 0ca49f2c9abfe11f892d76de95e41fbb1eb390ea /indra/newview/llimview.cpp | |
| parent | 5285a7fa7ec67c2337c5f071e6785b143e24c9a6 (diff) | |
| parent | 4ffcfe0a5fe21dcb49d79851eb43bd5d80623e0d (diff) | |
Merge from default branch
--HG--
branch : product-engine
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); |