diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 12:31:25 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 12:31:25 +0000 |
| commit | ef5cbcb0604cbffbb6c153a433411fedcf4e5831 (patch) | |
| tree | 06ff2fa6856e43b37a78b2dfa64e56008ce91b5c /indra/newview/llimview.cpp | |
| parent | 7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff) | |
| parent | d2c2d3f58e8d150c993708cbf13fc584a557ced7 (diff) | |
Merge from viewer2.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -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(); } } |
