diff options
| author | James Cook <james@lindenlab.com> | 2009-11-17 10:03:49 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-17 10:03:49 -0800 |
| commit | 6253e2611d3ecf4ff5c778d0e53f34aed06f35da (patch) | |
| tree | cd96eca8461fa5c0eac08b20c03e3c0039ff6bf6 /indra/llui/lltooltip.cpp | |
| parent | a2041387b1c39328aaf0d5037ca039a971a6d79c (diff) | |
| parent | ddee62b833480afdf730737bea6c97437daca74e (diff) | |
merge
Diffstat (limited to 'indra/llui/lltooltip.cpp')
| -rw-r--r-- | indra/llui/lltooltip.cpp | 3 |
1 files changed, 2 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; |