diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-07-30 19:39:08 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-30 19:39:08 -0700 |
| commit | a7efd0d8ddb68315653265d7e4ab87a156e56560 (patch) | |
| tree | 4210ae49796fdb8fb4b28f0bdd857dc338110070 /indra/llui/llslider.cpp | |
| parent | b3a83059c464c9a974d547f57ab8e93ca0bee0f1 (diff) | |
| parent | 29607ab70edea79cfdceaa52d632d77e6699cb8f (diff) | |
Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups.
Diffstat (limited to 'indra/llui/llslider.cpp')
| -rw-r--r-- | indra/llui/llslider.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp index f167836bee..9483cca104 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"), |