diff options
| -rw-r--r-- | indra/llui/llurlentry.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_colors.xml | 101 |
3 files changed, 107 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 34138da34d..7218211a44 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -789,6 +789,8 @@ LLStyle::EUnderlineLink LLUrlEntryAgentMention::getUnderline(const std::string& LLStyle::Params LLUrlEntryAgentMention::getStyle(const std::string& url) const { LLStyle::Params style_params = LLUrlEntryAgent::getStyle(url); + style_params.color = LLUIColorTable::instance().getColor("ChatMentionFont"); + style_params.readonly_color = LLUIColorTable::instance().getColor("ChatMentionFont"); style_params.font.style = "NORMAL"; style_params.draw_highlight_bg = true; diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index cb190d3d34..f0ada22d66 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -1001,9 +1001,12 @@ name="OutfitSnapshotMacMask2" value="0.1 0.1 0.1 1"/> <color + name="ChatMentionFont" + value="0.3 0.82 1 1" /> + <color name="ChatMentionHighlight" value="0.82 0.91 0.98 0.15" /> <color name="ChatSelfMentionHighlight" - value="0.85 0.75 0.40 0.5" /> + value="1 1 0 1" /> </colors> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 44df5354aa..8a09e15396 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -299,6 +299,107 @@ width="95"> URLs </text> + <color_swatch + can_apply_immediately="true" + color="EmphasisColor" + follows="left|top" + height="24" + label_height="0" + layout="topleft" + left="360" + name="mentions" + top_pad="-15" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="ChatMentionFont" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="ChatMentionFont" /> + </color_swatch> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_mentions" + top_delta="5" + width="95"> + Mentions + </text> + <text + follows="left|top" + layout="topleft" + left="30" + height="12" + name="mentions_colors" + top_pad="20" + width="170"> + Chat mentions highlight colors: + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="24" + label_height="0" + layout="topleft" + left="40" + name="mention_self" + top_pad="10" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="ChatSelfMentionHighlight" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="ChatSelfMentionHighlight" /> + </color_swatch> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_mentions_self" + top_delta="5" + width="95"> + Me + </text> + <color_swatch + can_apply_immediately="true" + follows="left|top" + height="24" + label_height="0" + layout="topleft" + left="190" + name="mention_others" + top_pad="-15" + width="44" > + <color_swatch.init_callback + function="Pref.getUIColor" + parameter="ChatMentionHighlight" /> + <color_swatch.commit_callback + function="Pref.applyUIColor" + parameter="ChatMentionHighlight" /> + </color_swatch> + <text + type="string" + length="1" + follows="left|top" + height="10" + layout="topleft" + left_pad="5" + mouse_opaque="false" + name="text_mentions_others" + top_delta="5" + width="95"> + Others + </text> <text follows="left|top" layout="topleft" |