diff options
author | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
commit | 8330a4d0fd046834a27a988102b439a6ec1f0aa2 (patch) | |
tree | 7fd2227522bf5c2377a45124cb50aad0afb90597 /indra/newview/llimview.cpp | |
parent | 3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c (diff) | |
parent | 18bf5f09b22a2c36ccf543104b1115a7b0b9db71 (diff) |
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r-- | indra/newview/llimview.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 060ad17c02..ec3fe48151 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2719,6 +2719,15 @@ void LLIMMgr::inviteToSession( { LLFloaterReg::showInstance("incoming_call", payload, FALSE); } + + // Add the caller to the Recent List here (at this point + // "incoming_call" floater is shown and the recipient can + // reject the call), because even if a recipient will reject + // the call, the caller should be added to the recent list + // anyway. STORM-507. + if(type == IM_SESSION_P2P_INVITE) + LLRecentPeople::instance().add(caller_id); + mPendingInvitations[session_id.asString()] = LLSD(); } } |