diff options
author | Paul ProductEngine <pguslisty@productengine.com> | 2012-01-20 08:59:37 +0200 |
---|---|---|
committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-01-20 08:59:37 +0200 |
commit | 82e90a6af580890eb685fc6b684d79ca905e6279 (patch) | |
tree | 63d9cb49ecf720c538afd7cfed491f27b8df0216 /indra/newview/llviewermessage.cpp | |
parent | 0062c053ed59e05400312efc0f9b6fcf29590733 (diff) |
EXP-901 FIXED (Can see "typing" messages from users who are not allowed to IM you)
- If "Only friends and groups can IM me" option is ON but the user got message from non-friend, show notification one time per session.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3c6770df43..6bb13bb8d7 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2360,8 +2360,15 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL; bool mute_im = is_muted; - if(accept_im_from_only_friend&&!is_friend) + if (accept_im_from_only_friend && !is_friend) { + if (!gIMMgr->isNonFriendSessionNotified(session_id)) + { + std::string message = LLTrans::getString("IM_unblock_only_groups_friends"); + gIMMgr->addMessage(session_id, from_id, name, message); + gIMMgr->addNotifiedNonFriendSessionID(session_id); + } + mute_im = true; } if (!mute_im || is_linden) |