summaryrefslogtreecommitdiff
path: root/indra/llui/llslider.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-09-01 12:21:51 -0400
committerbrad kittenbrink <brad@lindenlab.com>2009-09-01 12:21:51 -0400
commitbae94e434090f83d12941ca25aca13203db671b6 (patch)
treeb83d09a5eb4780c5f3077ac73b10199582f6adcd /indra/llui/llslider.cpp
parent3069355a6f33b7bbcfc8c493910a40e6836249e1 (diff)
parent3dc23bc1831e84b8d8288d9a4f006f9597d9443a (diff)
Merged login-api with viewer-2.0.0-3 up through r132290.
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 1c394a71dd..840dd9b089 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"),