diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-01-06 11:35:32 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-01-06 11:35:32 -0500 |
| commit | 82a56fb9dac717360aa99ac3ec75314c0a05acd6 (patch) | |
| tree | 834b72d64d065bcfe4ccb9b2e1433373739106c6 | |
| parent | 4d4ad1afaf6fb2473e4a1261416e94a144cabce9 (diff) | |
| parent | cacaf21eb5657065dc510bf245cf5fddb4f48a19 (diff) | |
merge changes for STORM-2088
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llnetmap.cpp | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 4f6fc56ed9..074c8b918a 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -723,6 +723,7 @@ Jonathan Yap STORM-2034 STORM-2018 STORM-2086 + STORM-2088 STORM-2094 STORM-2099 Kadah Coba diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 1685a18e26..fbd9b127b6 100755 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -97,13 +97,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() @@ -138,6 +138,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; } |