summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorpaul_productengine <none@none>2011-01-31 19:47:50 +0200
committerpaul_productengine <none@none>2011-01-31 19:47:50 +0200
commit1a1d5f4c00ce2f45ce0952b0cd093103e989c477 (patch)
treecb3b94e7ce6c6b9ee1f847afcfe0bd0e9c1d0e03 /indra
parent64f153d547fe5f24d03f37e5766ba41efe140f10 (diff)
STORM-507 FIXED User that has sent p2p call invitation to other user, is not added to Recent tab
- Add the caller to the Recent List just after Incoming Call floater appears. Before recicpient accepted or rejected the call.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llimview.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 9623554200..0ef502b81b 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();
}
}