diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:06:08 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-20 02:06:08 +0300 |
| commit | c50f96b49215b4279192ffc3eb336a3465a00756 (patch) | |
| tree | da923846a177ea97882dd0ba07b9235a5f0e7b8b /indra/newview/llnetmap.cpp | |
| parent | d3de134da047460c68ffd7cc732e592049a1e83d (diff) | |
| parent | b25a22a2c113a1e95f2cd5d45bb5b80a756c4a80 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r--[-rwxr-xr-x] | 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 100755..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; } |