MAINT-180 FIXED Reject group and ad-hoc chat messages from lindens when we are busy.
parent
8e8976d216
commit
cbbbbcb6c3
|
|
@ -3223,7 +3223,6 @@ public:
|
|||
//just like a normal IM
|
||||
//this is just replicated code from process_improved_im
|
||||
//and should really go in it's own function -jwolk
|
||||
LLChat chat;
|
||||
|
||||
std::string message = message_params["message"].asString();
|
||||
std::string name = message_params["from_name"].asString();
|
||||
|
|
@ -3241,14 +3240,7 @@ public:
|
|||
name,
|
||||
LLMute::flagTextChat);
|
||||
|
||||
BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
|
||||
std::string separator_string(": ");
|
||||
|
||||
chat.mMuted = is_muted && !is_linden;
|
||||
chat.mFromID = from_id;
|
||||
chat.mFromName = name;
|
||||
|
||||
if (!is_linden && is_busy)
|
||||
if (is_busy || is_muted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2682,7 +2682,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
|
|||
|
||||
case IM_SESSION_SEND:
|
||||
{
|
||||
if (!is_linden && is_busy)
|
||||
if (is_busy)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue