From d8347252de9fa95ee65b953339c3a3928578b320 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 19 Mar 2022 15:32:41 -0400
Subject: [PATCH] Small opts and bug fixes
---
indra/llui/llurlentry.cpp | 10 ++++++----
.../skins/default/xui/en/panel_preferences_colors.xml | 1 -
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index a509bb3b8a3..e04dd726db8 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 9e825fe5168..bb5f45c667f 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"
--
GitLab