summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoroondas Gupte <hg@boroon.dasgupta.ch>2011-06-20 15:16:27 +0200
committerBoroondas Gupte <hg@boroon.dasgupta.ch>2011-06-20 15:16:27 +0200
commitc9eae38156b1eafad0c9e3ba5fdf7989b0a8d9db (patch)
tree5ea28ec9fd75aece40092af5f3972cae69b51028
parent0274c1f2b16e571a0cc6295d1f3073b136210a7c (diff)
VWR-26066: FIXED 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.txt1
-rw-r--r--indra/newview/llfloaterworldmap.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c18d3eb171..ccae0de59b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -125,6 +125,7 @@ blino Nakamura
VWR-17
Boroondas Gupte
VWR-233
+ VWR-26066
WEB-262
Bulli Schumann
CT-218
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index cdc4cbc411..bd68875ba5 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -67,7 +67,7 @@
#include "llappviewer.h"
#include "llmapimagetype.h"
#include "llweb.h"
-#include "llslider.h"
+#include "llsliderctrl.h"
#include "llglheaders.h"
#include "llwindow.h" // copyTextToClipboard()
@@ -974,7 +974,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);
}