Allow UI tooltips and "ambient inspector" tips to have different text colors

5 files changed, 8 insertions, 1 deletions

diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index bb85177811..959313a5b6 100644
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -163,6 +163,7 @@ LLToolTip::Params::Params()
 	visible_time_far("visible_time_far", LLUI::sSettingGroups["config"]->getF32( "ToolTipVisibleTimeFar" )),
 	sticky_rect("sticky_rect"),
 	image("image"),
+	text_color("text_color"),
 	time_based_media("time_based_media", false),
 	web_based_media("web_based_media", false),
 	media_playing("media_playing", false)
@@ -186,7 +187,7 @@ LLToolTip::LLToolTip(const LLToolTip::Params& p)
 	params.h_pad = 0;
 	params.v_pad = 0;
 	params.mouse_opaque = false;
-	params.text_color = LLUIColorTable::instance().getColor( "ToolTipTextColor" );
+	params.text_color = p.text_color;
 	params.bg_visible = false;
 	params.font = p.font;
 	params.use_ellipses = true;
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index 8c8fdf0a4c..7978b6a583 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -88,6 +88,7 @@ public:
 		Optional<LLRect>			sticky_rect;
 		Optional<const LLFontGL*>	font;
 		Optional<LLUIImage*>		image;
+		Optional<LLUIColor>			text_color;
 		Optional<bool>				time_based_media,
 									web_based_media,
 									media_playing;
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 6564ec9ab0..eb8ec00bb9 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -665,6 +665,9 @@
      name="ToolTipTextColor"
      reference="DkGray2" />
     <color
+     name="InspectorTipTextColor"
+     reference="LtGray" />
+    <color
      name="UserChatColor"
      reference="LtGray" />
     <color
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
index f631ef3957..8ec206023e 100644
--- a/indra/newview/skins/default/xui/en/widgets/inspector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
@@ -6,4 +6,5 @@
           bg_opaque_image="none"
           background_opaque="true"
           bg_alpha_image="none"
+		  text_color="InspectorTipTextColor"
  />
diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
index c209c26c92..a19201f7c3 100644
--- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
@@ -8,4 +8,5 @@
           bg_opaque_image="Tooltip"
           background_opaque="true"
           background_visible="true"
+		  text_color="ToolTipTextColor"
  />