summaryrefslogtreecommitdiff
path: root/indra/llui/llslider.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-09-30 21:42:04 -0400
committerNat Goodspeed <nat@lindenlab.com>2009-09-30 21:42:04 -0400
commiteca30a22626b9a3e68e0e55f8da75614cd60d713 (patch)
treed27f30f138553c1f0fbc0e61ef0d2ae036d54662 /indra/llui/llslider.cpp
parentbc4444cd78067cbf11d3ffb210375a31a33f96bd (diff)
parent3f05d552fec9d4d9a17c9131f445a7db0eef561f (diff)
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
Diffstat (limited to 'indra/llui/llslider.cpp')
-rw-r--r--indra/llui/llslider.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp
index 07b6895378..f86776384a 100644
--- a/indra/llui/llslider.cpp
+++ b/indra/llui/llslider.cpp
@@ -43,6 +43,8 @@
#include "lluictrlfactory.h"
static LLDefaultChildRegistry::Register<LLSlider> r1("slider_bar");
+//FIXME: make this into an unregistered template so that code constructed sliders don't
+// have ambigious template lookup problem
LLSlider::Params::Params()
: track_color("track_color"),