Small opts and bug fixes

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;
 }
 

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"