diff options
| author | Jonathan Yap <none@none> | 2010-12-18 16:44:51 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2010-12-18 16:44:51 -0500 |
| commit | 09c7d38166e3f5d04ed6321b2ac06c4112bb858b (patch) | |
| tree | a84da4e12d43b36bef99e74d05b50735826c233e | |
| parent | 452d9d5e3d5261fa5154bd1fe7ef6298dcacf074 (diff) | |
STORM-467 Fix for minimap zoom does not persist to the next session
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfloatermap.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llnetmap.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 740c2f470c..3039d6372b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -735,6 +735,7 @@ Tue Torok CT-74 Twisted Laws SNOW-352 + STORM-467 Vadim Bigbear VWR-2681 Vector Hastings diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp index 351b9ac5da..da32467423 100644 --- a/indra/newview/llfloatermap.cpp +++ b/indra/newview/llfloatermap.cpp @@ -83,7 +83,6 @@ LLFloaterMap::~LLFloaterMap() BOOL LLFloaterMap::postBuild() { mMap = getChild<LLNetMap>("Net Map"); - mMap->setScale(gSavedSettings.getF32("MiniMapScale")); mMap->setToolTipMsg(getString("ToolTipMsg")); sendChildToBack(mMap); @@ -296,7 +295,6 @@ void LLFloaterMap::handleZoom(const LLSD& userdata) scale = LLNetMap::MAP_SCALE_MIN; if (scale != 0.0f) { - gSavedSettings.setF32("MiniMapScale", scale ); mMap->setScale(scale); } } diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index f084002385..1a8ec4991d 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -94,10 +94,12 @@ LLNetMap::LLNetMap (const Params & p) mToolTipMsg() { mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); + setScale(gSavedSettings.getF32("MiniMapScale")); } LLNetMap::~LLNetMap() { + gSavedSettings.setF32("MiniMapScale", mScale); } void LLNetMap::setScale( F32 scale ) |