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

Fixed reporting to nearby chat not showing in console

master
Ansariel 2013-07-16 00:41:11 +02:00
parent ff1ee400e2
commit e98efe34e3
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/fsconsoleutils.cpp
View File

@ -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();
}

4
indra/newview/llviewermessage.cpp
View File

@ -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);
}