diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 |
| commit | 71a468c6fb52f2f2cc7ebd17e548e9eaf3a875a5 (patch) | |
| tree | e2d49a6fe81f8fd9f0e8793112830d7b17d9068d /indra/newview/llnetmap.cpp | |
| parent | f46526b16004e734d0a459e482ab9bb5df656c54 (diff) | |
| parent | 94744d4e5ec1bb8dfafa2c459ebc8fbf0b92a68a (diff) | |
merge changes for other open sourc contributions
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -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 --- 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; } |