From e98efe34e3bf94c5306be96509cd77424d1b4a4b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 16 Jul 2013 00:41:11 +0200 Subject: [PATCH] Fixed reporting to nearby chat not showing in console --- indra/newview/fsconsoleutils.cpp | 7 ++----- indra/newview/llviewermessage.cpp | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/indra/newview/fsconsoleutils.cpp b/indra/newview/fsconsoleutils.cpp index 0832d8629b..fbe28727c2 100644 --- a/indra/newview/fsconsoleutils.cpp +++ b/indra/newview/fsconsoleutils.cpp @@ -108,11 +108,8 @@ bool FSConsoleUtils::ProcessChatMessage(const LLChat& chat_msg, const LLSD &args } else { - // [CHUI Merge] - //if (chat_msg.mSourceType == CHAT_SOURCE_SYSTEM && - // args["type"].asInteger() == LLNotificationsUI::NT_MONEYCHAT) - if (chat_msg.mSourceType == CHAT_SOURCE_SYSTEM) - // [CHUI Merge] + if (args.has("money_tracker") && args["money_tracker"].asBoolean() == true && + chat_msg.mSourceType == CHAT_SOURCE_SYSTEM) { consoleChat = args["console_message"].asString(); } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 87a96d5712..58aafcbadf 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -6619,7 +6619,7 @@ static void money_balance_group_notify(const LLUUID& group_id, chat.mText = args["SLURLMESSAGE"].asString(); chat.mSourceType = CHAT_SOURCE_SYSTEM; LLSD chat_args; - //chat_args["type"] = LLNotificationsUI::NT_MONEYCHAT; [CHUI Merge] + chat_args["money_tracker"] = true; chat_args["console_message"] = llformat(args["MESSAGE"].asString().c_str(), name.c_str()); LLNotificationsUI::LLNotificationManager::instance().onChat(chat, chat_args); } @@ -6646,7 +6646,7 @@ static void money_balance_avatar_notify(const LLUUID& agent_id, chat.mText = args["SLURLMESSAGE"].asString(); chat.mSourceType = CHAT_SOURCE_SYSTEM; LLSD chat_args; - //chat_args["type"] = LLNotificationsUI::NT_MONEYCHAT; [CHUI Merge] + chat_args["money_tracker"] = true; chat_args["console_message"] = llformat(args["MESSAGE"].asString().c_str(), av_name.getCompleteName().c_str()); LLNotificationsUI::LLNotificationManager::instance().onChat(chat, chat_args); }