From c9eae38156b1eafad0c9e3ba5fdf7989b0a8d9db Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Mon, 20 Jun 2011 15:16:27 +0200 Subject: VWR-26066: FIXED request LLFloaterWorldMap child "zoom slider" with correct type LLSliderCtrl instead of LLSlider to get rid of warning when opening map flaoter --- doc/contributions.txt | 1 + indra/newview/llfloaterworldmap.cpp | 4 ++-- 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("zoom slider")->setMinValue(min_power); + getChild("zoom slider")->setMinValue(min_power); } -- cgit v1.2.3