diff options
| author | James Cook <james@lindenlab.com> | 2009-11-16 23:33:12 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-16 23:33:12 -0800 |
| commit | 028a8af51946cac42e9b3d1a0ecd1b79b36d0383 (patch) | |
| tree | 49d9c7ff7ef03dff81b77c89f421bd185ba4c3de /indra/llui | |
| parent | f15862eee02b4b83f0d17d1bc7a9dda13b1fd11b (diff) | |
Allow UI tooltips and "ambient inspector" tips to have different text colors
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltooltip.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/lltooltip.h | 1 |
2 files changed, 3 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; |