diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
| commit | baa73fddd9287ddafd2d31551cb253b355ed910a (patch) | |
| tree | e3f0986617fe6c0ee0a14df6aac13c6bb6f92507 /indra/llui/llslider.cpp | |
| parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
| parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) | |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/llui/llslider.cpp')
| -rw-r--r-- | indra/llui/llslider.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp index ff2f5d3da0..8070dc4d02 100644 --- a/indra/llui/llslider.cpp +++ b/indra/llui/llslider.cpp @@ -43,10 +43,9 @@ #include "llimagegl.h" #include "lluictrlfactory.h" -static LLRegisterWidget<LLSlider> r1("slider_bar"); +static LLDefaultWidgetRegistry::Register<LLSlider> r1("slider_bar"); //FIXME: make this into an unregistered template so that code constructed sliders don't // have ambigious template lookup problem -static LLRegisterWidget<LLSlider> r2("volume_slider"); LLSlider::Params::Params() : track_color("track_color"), |