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

FIRE-3547 Updated to make sure no double notices are showing up in Nearby Chat

meow-7.2.2
Selo 2011-10-15 16:21:36 +02:00
parent e52780d448
commit 9ebc2078b6
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llcallingcard.cpp
View File

@ -819,16 +819,8 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
// If desired, also send it to nearby chat, this allows friends'
// online/offline times to be referenced in chat & logged.
// [FIRE-3522 : SJ] Only show Online/Offline toast for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Toasts
if (gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat"))
{
LLChat chat;
chat.mText = notify_msg;
chat.mSourceType = CHAT_SOURCE_SYSTEM;
args["type"] = LLNotificationsUI::NT_NEARBYCHAT;
LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
}
// [FIRE-3522 : SJ] show Online/Offline toast for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Nearby Chat
if (gSavedSettings.getBOOL("FSContactSetsNotificationNearbyChat") && LGGContactSets::getInstance()->notifyForFriend(agent_id))
// or for groups which have enabled "Show notice for this set" and in the settingpage of CS is checked that the messages need to be in Nearby Chat
if ((gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat")) || (gSavedSettings.getBOOL("FSContactSetsNotificationNearbyChat") && LGGContactSets::getInstance()->notifyForFriend(agent_id)))
{
LLChat chat;
chat.mText = notify_msg;