diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-22 09:06:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-22 09:06:42 -0400 |
| commit | ebbadcf7720cfcbdf5da99ad219de4e7edcf0c6f (patch) | |
| tree | b7782e3c46284e99c3bb9ef081ce4cc8f04d292a /indra/newview/llfloaterworldmap.cpp | |
| parent | d26356d7e16191da90cae23d3871d4e7289e175f (diff) | |
| parent | f45747e52401569c0ee489d7f408cf00f4c58149 (diff) | |
merge changes from snowstorm team review build
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rwxr-xr-x | indra/newview/llfloaterworldmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index eb3c7ee469..d5f0648f3b 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -70,7 +70,7 @@ #include "llappviewer.h" #include "llmapimagetype.h" #include "llweb.h" -#include "llslider.h" +#include "llsliderctrl.h" #include "message.h" #include "llwindow.h" // copyTextToClipboard() #include <algorithm> @@ -1029,7 +1029,7 @@ void LLFloaterWorldMap::adjustZoomSliderBounds() F32 min_power = log(pixels_per_region/256.f)/log(2.f); - getChild<LLSlider>("zoom slider")->setMinValue(min_power); + getChild<LLSliderCtrl>("zoom slider")->setMinValue(min_power); } |