diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-06-20 15:22:11 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-06-20 15:22:11 +0200 |
| commit | 90287404b20ab3f50799c90e3f021d3e59bc1cee (patch) | |
| tree | 79b7a78f91ed3eb7d77f6c9947dd9563b39362e7 | |
| parent | 7f6d49df43c660b9f5632ffb8a30f90ee718cac0 (diff) | |
| parent | c9eae38156b1eafad0c9e3ba5fdf7989b0a8d9db (diff) | |
merged VWR-26066: request LLFloaterWorldMap child "zoom slider" with correct type
LLSliderCtrl instead of LLSlider to get rid of warning when opening map flaoter
| -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 b744f4db3e..65cecf01ff 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -214,6 +214,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 f8a4ce7ad0..ab7444ff6c 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); } |