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

FIRE-5377: Use unique color setting for object chat headers, don't piggyback on HTMLLinkColor (default to HTMLLinkColor though)

meow-7.2.2
Cinders 2013-08-23 12:31:22 -06:00
parent 71e6ea7420
commit 6d51539f6c
3 changed files with 80 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/fschathistory.cpp
View File

@ -1013,8 +1013,8 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
// set the link for the object name to be the objectim SLapp
// (don't let object names with hyperlinks override our objectim Url)
LLStyle::Params link_params(body_message_params);
link_params.color.control = "HTMLLinkColor";
LLColor4 link_color = LLUIColorTable::instance().getColor("HTMLLinkColor");
link_params.color.control = "ChatNameObjectColor";
LLColor4 link_color = LLUIColorTable::instance().getColor("ChatNameObjectColor");
link_params.color = link_color;
link_params.readonly_color = link_color;
if (message_from_log && !is_conversation_log)

3
indra/newview/skins/default/colors.xml
View File

@ -902,6 +902,9 @@
<color
name="ChatNameColor"
reference="AccentColor" />
<color
name="ChatNameObjectColor"
reference="AccentColor" />
<color
name="ObjectChatColor"
reference="EmphasisColor" />

110
indra/newview/skins/default/xui/en/panel_preferences_colors.xml
View File

@ -37,7 +37,7 @@
name="font_colors"
top_pad="15"
width="120">
UI Text Colors:
Chat Message Colors:
</text>
<color_swatch
color="UserChatColor"
@ -392,50 +392,18 @@
</text>
<color_swatch
can_apply_immediately="true"
color="ChatNameColor"
color="DirectChatColor"
follows="left|top"
height="24"
label_height="0"
label_width="60"
layout="topleft"
left="360"
name="ChatNameColor"
name="direct"
top_pad="-15"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="ChatNameColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="ChatNameColor" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="chat_name_label"
top_delta="5"
width="110">
Chat Headers
</text>
<color_swatch
can_apply_immediately="true"
color="DirectChatColor"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="40"
name="Direct"
top_pad="19"
width="44" >
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="DirectChatColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
@ -454,6 +422,78 @@
width="95">
Direct
</text>
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="header_colors"
top_pad="15"
width="120">
Chat headers:
</text>
<color_swatch
can_apply_immediately="true"
color="ChatNameColor"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="40"
name="chat_header"
top_pad="8"
width="44" >
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="ChatNameColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="ChatNameColor" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="chat_name_label"
top_delta="5"
width="110">
Avatars
</text>
<color_swatch
can_apply_immediately="true"
color="ChatNameObjectColor"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="190"
name="object_name_header"
top_pad="-15"
width="44" >
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="ChatNameObjectColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="ChatNameObjectColor" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="object_name_header_label"
top_delta="5"
width="95">
Objects
</text>
<check_box
control_name="FSColorIMsDistinctly"
follows="left|top"