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

FIRE-6169: When Autoresponse is enabled, Direct Delivery offers come from (nobody) in IM

Ansariel 2014-01-25 15:03:57 +01:00
parent 9c3155ac81
commit 307edca6d1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewermessage.cpp
View File

@ -2782,10 +2782,13 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// <FS:Ansariel> Only send the busy reponse if either the sender is not
// muted OR the sender is muted and we explicitely want
// to inform him about that fact.
else if ( (offline == IM_ONLINE &&
((is_do_not_disturb && (!is_muted || (is_muted && !is_autorespond_muted))) ||
(is_autorespond && !is_muted) || (is_autorespond_nonfriends && !is_friend && !is_muted) || (FSSendAwayAvatarResponse && is_afk && !is_muted)) && name != SYSTEM_FROM) &&
(RlvActions::canReceiveIM(from_id)) )
else if (offline == IM_ONLINE
&& ((is_do_not_disturb && (!is_muted || (is_muted && !is_autorespond_muted))) ||
(is_autorespond && !is_muted) || (is_autorespond_nonfriends && !is_friend && !is_muted) ||
(FSSendAwayAvatarResponse && is_afk && !is_muted))
&& from_id.notNull()
&& to_id.notNull()
&& RlvActions::canReceiveIM(from_id))
// [/RLVa:KB]
{
// <FS:Ansariel> Log autoresponse notification after initial message