diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-01-29 21:09:28 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-01-29 21:09:28 +0200 |
| commit | 0db7f3a783f3514f31a09025bff9ca86589a1ca0 (patch) | |
| tree | 2d71050a8ad1798082b2260bc567eed358ce25f2 /indra/newview | |
| parent | bc5cd7337f3b87d1805309cbd9e27f9d86fad100 (diff) | |
Fixed major bug Bug EXT-4759 (Second incoming call notification doesn't appear if first call was canceled by caller).
- Bug was caused by simply closing invite floater when call becomes invalid, so pending invite wasn't removed from IM manager and later this caused failure of check on which floater is shown. Added clearPendingAgentListUpdates() and clearPendingInvitation() before closure.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 80d2778934..b7d4db853e 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1733,6 +1733,9 @@ void LLIncomingCallDialog::onLifetimeExpired() { // close invitation if call is already not valid mLifetimeTimer.stop(); + LLUUID session_id = mPayload["session_id"].asUUID(); + gIMMgr->clearPendingAgentListUpdates(session_id); + gIMMgr->clearPendingInvitation(session_id); closeFloater(); } } |