Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make chat loaded from log file be in LogChatColor instead of hardcoded grey

Browse Source
This commit is contained in:
Liru Færs
2019-11-16 10:02:01 -05:00
parent fc649854ff
commit 78fbc214ca
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/app_settings/settings.xml
View File

@@ -2079,6 +2079,24 @@ This should be as low as possible, but too low may break functionality</string>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>LogChatColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages loaded from your log</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.5</real>
<real>0.5</real>
<real>0.5</real>
<real>1.0</real>
</array>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>UISndAlert</key>
<map>
<key>Comment</key>

2
indra/newview/llfloaterchat.cpp
View File

@@ -277,7 +277,7 @@ void LLFloaterChat::addChatHistory(LLChat& chat, bool log_to_file)
LLColor4 color = get_text_color(chat);
if (!log_to_file) color = LLColor4::grey; //Recap from log file.
if (!log_to_file) color = gSavedSettings.getColor("LogChatColor"); //Recap from log file.
if (chat.mChatType == CHAT_TYPE_DEBUG_MSG)
{

2
indra/newview/llimpanel.cpp
View File

@@ -1670,7 +1670,7 @@ void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string
}
//self->addHistoryLine(line, LLColor4::grey, FALSE);
LLStyleSP style(new LLStyle(gSavedSettings.getColor4("SystemChatColor")));
LLStyleSP style(new LLStyle(true, gSavedSettings.getColor4("LogChatColor"), LLStringUtil::null));
self->mHistoryEditor->appendText(message, false, true, style, false);
}