diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-30 16:05:59 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-30 16:05:59 +0200 |
| commit | 8b93a0d83d15416a381261d7a47b535b36f40ff5 (patch) | |
| tree | ab1369867301158e8c4c04f8b25f9be86f4d39ce /indra | |
| parent | db482969ed69b16b1755599750dd2d80cb4daff8 (diff) | |
fixed EXT-2787 “Outdated voice chat invitation never hides itself”,
corrected check is invite from group or ad-hoc call to avoid hide incoming
call dialog for that cases;
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a7ce027416..40227539d0 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1748,7 +1748,8 @@ BOOL LLIncomingCallDialog::postBuild() childSetAction("Start IM", onStartIM, this); childSetFocus("Accept"); - if(mPayload["notify_box_type"] != "VoiceInviteGroup" && mPayload["notify_box_type"] != "VoiceInviteAdHoc") + std::string notify_box_type = mPayload["notify_box_type"].asString(); + if(notify_box_type != "VoiceInviteGroup" && notify_box_type != "VoiceInviteAdHoc") { // starting notification's timer for P2P and AVALINE invitations mLifetimeTimer.start(); |