diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-12 11:11:17 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-12 11:11:17 -0800 |
| commit | 3fa22188387d656f0a3c29c474604b309e64da6d (patch) | |
| tree | 010ed87b61b388c16a4c3e831bb3c862d607771e | |
| parent | 76b7bc1a4bdc105798b6e580915530e47c46ac78 (diff) | |
| parent | dda4150e01fdad5de5720c756e29169a6ce635f7 (diff) | |
STORM-393 : pull in viewer-development
| -rw-r--r-- | indra/llui/llurlentry.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 4f7b4be526..049a45c3bc 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -684,8 +684,8 @@ std::string LLUrlEntryGroup::getLabel(const std::string &url, const LLUrlLabelCa LLStyle::Params LLUrlEntryGroup::getStyle() const { LLStyle::Params style_params = LLUrlEntryBase::getStyle(); - style_params.color = LLUIColorTable::instance().getColor("GroupLinkColor"); - style_params.readonly_color = LLUIColorTable::instance().getColor("GroupLinkColor"); + style_params.color = LLUIColorTable::instance().getColor("HTMLLinkColor"); + style_params.readonly_color = LLUIColorTable::instance().getColor("HTMLLinkColor"); return style_params; } diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 62441fd984..75aec21f93 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -115,9 +115,6 @@ name="AlertCautionTextColor" reference="LtYellow" /> <color - name="AgentLinkColor" - reference="EmphasisColor" /> - <color name="AlertTextColor" value="0.58 0.66 0.84 1" /> <color @@ -349,9 +346,6 @@ name="GridlineShadowColor" value="0 0 0 0.31" /> <color - name="GroupLinkColor" - reference="White" /> - <color name="GroupNotifyBoxColor" value="0.3344 0.5456 0.5159 1" /> <color |