diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-12-14 00:46:11 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-12-14 00:46:11 +0200 |
| commit | 74a56f30aa0ef4daef41ef5fdac98610b2b109df (patch) | |
| tree | f526ea45ddc0e0724c2c34ecc59b70cd7ea3c2a2 /indra/newview/llfloaterworldmap.cpp | |
| parent | 4ab4c4498a04576a3cddf3533359a15a636b53b6 (diff) | |
| parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 3c3b004d2c..1e9c9ce5e0 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -300,8 +300,8 @@ BOOL LLFloaterWorldMap::postBuild() landmark_combo->setTextChangedCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) ); mListLandmarkCombo = dynamic_cast<LLCtrlListInterface *>(landmark_combo); - mCurZoomVal = log(LLWorldMapView::sMapScale)/log(2.f); - getChild<LLUICtrl>("zoom slider")->setValue(LLWorldMapView::sMapScale); + mCurZoomVal = log(LLWorldMapView::sMapScale/256.f)/log(2.f); + getChild<LLUICtrl>("zoom slider")->setValue(mCurZoomVal); setDefaultBtn(NULL); |