SL-15354 Fixed object IMs not respecting chat settings
parent
77a8bd878b
commit
d996497c5e
|
|
@ -643,8 +643,18 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
|
|||
}
|
||||
}
|
||||
|
||||
std::string user_preferences;
|
||||
if (chat_msg.mSourceType == CHAT_SOURCE_OBJECT)
|
||||
{
|
||||
user_preferences = gSavedSettings.getString("NotificationObjectIMOptions");
|
||||
}
|
||||
else
|
||||
{
|
||||
user_preferences = gSavedSettings.getString("NotificationNearbyChatOptions");
|
||||
}
|
||||
|
||||
//Will show toast when chat preference is set
|
||||
if((gSavedSettings.getString("NotificationNearbyChatOptions") == "toast") || !nearby_chat->isMessagePaneExpanded())
|
||||
if((user_preferences == "toast") || !nearby_chat->isMessagePaneExpanded())
|
||||
{
|
||||
// Add a nearby chat toast.
|
||||
LLUUID id;
|
||||
|
|
|
|||
Loading…
Reference in New Issue