diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/llui/lldraghandle.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/llui/lldraghandle.h')
| -rw-r--r-- | indra/llui/lldraghandle.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h index 8b53c46ae9..88ec1d21f8 100644 --- a/indra/llui/lldraghandle.h +++ b/indra/llui/lldraghandle.h @@ -53,8 +53,9 @@ public: Optional<LLUIColor> drag_shadow_color; Params() - : drag_highlight_color("", LLUI::getCachedColorFunctor("DefaultHighlightLight")), - drag_shadow_color("", LLUI::getCachedColorFunctor("DefaultShadowDark")) + : label("label"), + drag_highlight_color("drag_highlight_color", LLUIColorTable::instance().getColor("DefaultHighlightLight")), + drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark")) { mouse_opaque(true); follows.flags(FOLLOWS_ALL); |