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

FIRE-11437 - Fix chat moderator styling. Also, revert my changes to llstylemap.cpp, grab a speaker's slurl directly

meow-7.2.2
Cinders 2013-08-23 08:41:48 -06:00
parent 80195b66b2
commit 94f55ec769
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/lltextbase.cpp
View File

@ -2150,7 +2150,11 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
// </FS:Ansariel> Optional icon position
// output the styled Url
appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly());
// <FS:CR> FIRE-11437 - Don't supress font style for chat history name links
//appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly());
appendAndHighlightTextImpl(match.getLabel(), part, link_params,
input_params.is_name_slurl ? false : match.underlineOnHoverOnly());
// </FS:CR>
// set the tooltip for the Url label
if (! match.getTooltip().empty())

2
indra/newview/fschathistory.cpp
View File

@ -1034,8 +1034,8 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
// [/RLVa:KB]
{
LLStyle::Params link_params(body_message_params);
link_params.overwriteFrom(LLStyleMap::instance().lookupAgent(chat.mFromID));
link_params.is_name_slurl = true;
link_params.link_href = LLSLURL("agent", chat.mFromID, "inspect").getSLURLString();
link_params.color = name_color;
link_params.readonly_color = name_color;

5
indra/newview/llstylemap.cpp
View File

@ -42,9 +42,8 @@ const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source)
LLStyle::Params style_params;
if (source != LLUUID::null)
{
// <FS:CR> FIRE-11330 - Let chat history decide
//style_params.color.control = "HTMLLinkColor";
//style_params.readonly_color.control = "HTMLLinkColor";
style_params.color.control = "HTMLLinkColor";
style_params.readonly_color.control = "HTMLLinkColor";
style_params.link_href = LLSLURL("agent", source, "inspect").getSLURLString();
}
mMap[source] = style_params;