diff options
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfunctorregistry.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/llslider.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/llsliderctrl.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llfunctorregistry.cpp b/indra/llui/llfunctorregistry.cpp index 0c5b1655b1..5f9644f258 100644 --- a/indra/llui/llfunctorregistry.cpp +++ b/indra/llui/llfunctorregistry.cpp @@ -31,6 +31,7 @@ * $/LicenseInfo$ **/ +#include "linden_common.h" #include "llfunctorregistry.h" // This is a default functor always resident in the system. diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp index 66ed0d4e88..8070dc4d02 100644 --- a/indra/llui/llslider.cpp +++ b/indra/llui/llslider.cpp @@ -44,6 +44,8 @@ #include "lluictrlfactory.h" 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 LLSlider::Params::Params() : track_color("track_color"), diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp index 3abd960792..8bdeddcf75 100644 --- a/indra/llui/llsliderctrl.cpp +++ b/indra/llui/llsliderctrl.cpp @@ -398,4 +398,3 @@ void LLSliderCtrl::reportInvalidData() make_ui_sound("UISndBadKeystroke"); } - |