From 5d9f7c7ba83253ffd201202078be9b34c8f37658 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Wed, 11 Dec 2013 20:23:46 +0100 Subject: [PATCH] - internal : undo weird rearranging of code in process_improved_im --HG-- branch : RLVa --- indra/newview/llviewermessage.cpp | 34 ++++++++++--------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index dea60b5e71..3fb5a7dfa3 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2601,6 +2601,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) else { // standard message, not from system + std::string saved; + if(offline == IM_OFFLINE) + { + LLStringUtil::format_map_t args; + args["[LONG_TIMESTAMP]"] = formatted_time(timestamp); + saved = LLTrans::getString("Saved_message", args); + } + buffer = saved + message; + + 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 && !is_linden) { @@ -2624,29 +2635,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } // [/RLVa:KB] - std::string saved; - if(offline == IM_OFFLINE) - { - LLStringUtil::format_map_t args; - args["[LONG_TIMESTAMP]"] = formatted_time(timestamp); - saved = LLTrans::getString("Saved_message", args); - } - buffer = saved + message; - - 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 (!gIMMgr->isNonFriendSessionNotified(session_id)) -// { -// std::string message = LLTrans::getString("IM_unblock_only_groups_friends"); -// gIMMgr->addMessage(session_id, from_id, name, message, IM_OFFLINE == offline); -// gIMMgr->addNotifiedNonFriendSessionID(session_id); -// } -// -// mute_im = true; -// } if (!mute_im) { gIMMgr->addMessage(