diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-19 15:43:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-19 15:43:38 -0400 |
| commit | 181c34c984898d43f760ccf614f38683e9d3c333 (patch) | |
| tree | edd7e91ae765bde2bdda16a8a79786ecfd2c2c64 | |
| parent | aebeac6898a5d131f437cc2b889439d22ad0e04d (diff) | |
| parent | 90287404b20ab3f50799c90e3f021d3e59bc1cee (diff) | |
merge changes for vwr-26066
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llfloaterworldmap.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 68b0a4279f..ee56ef3665 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -219,6 +219,7 @@ Boroondas Gupte VWR-20891 VWR-23455 VWR-24487 + VWR-26066 WEB-262 Bulli Schumann CT-218 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); } |