diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-07 12:41:11 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-07 12:41:11 -0500 |
| commit | 5822fb00b605d4f4ddd01e887b40d04b67e162a9 (patch) | |
| tree | 0aa733a2357c99383f18ed34d2fb2ad4ad0caa24 /indra/newview/llnetmap.cpp | |
| parent | c7ebeb842010c4a814978f63c464e1546bd6a9be (diff) | |
| parent | 346ee6595d395a92a1445441467971510e6f4b6d (diff) | |
merge DRTVWR-398 build cleanup fixes
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index d7e7f13e87..5fc73c67d1 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -96,13 +96,13 @@ LLNetMap::LLNetMap (const Params & p) mToolTipMsg(), mPopupMenu(NULL) { + mScale = gSavedSettings.getF32("MiniMapScale"); + mPixelsPerMeter = mScale / REGION_WIDTH_METERS; mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); - setScale(gSavedSettings.getF32("MiniMapScale")); } LLNetMap::~LLNetMap() { - gSavedSettings.setF32("MiniMapScale", mScale); } BOOL LLNetMap::postBuild() @@ -137,6 +137,8 @@ void LLNetMap::setScale( F32 scale ) mPixelsPerMeter = mScale / REGION_WIDTH_METERS; mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); + gSavedSettings.setF32("MiniMapScale", mScale); + mUpdateNow = true; } |