livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- internal : undo weird rearranging of code in process_improved_im 

--HG--
branch : RLVa
meow-7.2.2
Kitty Barnett 2013-12-11 20:23:46 +01:00
parent 341aaa826d
commit 5d9f7c7ba8
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/llviewermessage.cpp
View File

@ -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(