diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index a509bb3b8a37bd6987f677d94fbd6a208a17eeec..e04dd726db88ddd6bee27eceac9d97aa5268e532 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -687,9 +687,10 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa LLStyle::Params LLUrlEntryAgent::getStyle() const { + static const LLUIColor html_link_col = LLUIColorTable::instance().getColor("HTMLLinkColor"); LLStyle::Params style_params = LLUrlEntryBase::getStyle(); - style_params.color = LLUIColorTable::instance().getColor("HTMLLinkColor"); - style_params.readonly_color = LLUIColorTable::instance().getColor("HTMLLinkColor"); + style_params.color = html_link_col; + style_params.readonly_color = html_link_col; return style_params; } @@ -953,9 +954,10 @@ std::string LLUrlEntryGroup::getLabel(const std::string &url, const LLUrlLabelCa LLStyle::Params LLUrlEntryGroup::getStyle() const { + static const LLUIColor html_link_col = LLUIColorTable::instance().getColor("HTMLLinkColor"); LLStyle::Params style_params = LLUrlEntryBase::getStyle(); - style_params.color = LLUIColorTable::instance().getColor("HTMLLinkColor"); - style_params.readonly_color = LLUIColorTable::instance().getColor("HTMLLinkColor"); + style_params.color = html_link_col; + style_params.readonly_color = html_link_col; return style_params; } 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 9e825fe516866445ba706e1535a2790b77d9684f..bb5f45c667f89253f2e1ff4dc98db70c11ce910e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -313,7 +313,6 @@ <color_swatch can_apply_immediately="true" color="0 0 0 1" - control_name="NameTagBackground" follows="left|top" height="24" label_height="0"