diff options
author | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
---|---|---|
committer | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
commit | 0274c1f2b16e571a0cc6295d1f3073b136210a7c (patch) | |
tree | 4396f7f721befba4f907c0871067e3da1cdf0494 /indra/newview/llfloaterworldmap.cpp | |
parent | 09d9b0556e8cf6c0a716e5b2c78b265799486331 (diff) |
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
-rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 8fe30ea485..cdc4cbc411 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -67,6 +67,7 @@ #include "llappviewer.h" #include "llmapimagetype.h" #include "llweb.h" +#include "llslider.h" #include "llglheaders.h" #include "llwindow.h" // copyTextToClipboard() @@ -972,7 +973,8 @@ void LLFloaterWorldMap::adjustZoomSliderBounds() pixels_per_region = llclamp(pixels_per_region, 1.f, ZOOM_MAX); F32 min_power = log(pixels_per_region/256.f)/log(2.f); - childSetMinValue("zoom slider", min_power); + + getChild<LLSlider>("zoom slider")->setMinValue(min_power); } |