Skip to content
Snippets Groups Projects
Commit 09c7d381 authored by Jonathan Yap's avatar Jonathan Yap
Browse files

STORM-467 Fix for minimap zoom does not persist to the next session

parent 452d9d5e
No related branches found
No related tags found
No related merge requests found
...@@ -735,6 +735,7 @@ Tue Torok ...@@ -735,6 +735,7 @@ Tue Torok
CT-74 CT-74
Twisted Laws Twisted Laws
SNOW-352 SNOW-352
STORM-467
Vadim Bigbear Vadim Bigbear
VWR-2681 VWR-2681
Vector Hastings Vector Hastings
......
...@@ -83,7 +83,6 @@ LLFloaterMap::~LLFloaterMap() ...@@ -83,7 +83,6 @@ LLFloaterMap::~LLFloaterMap()
BOOL LLFloaterMap::postBuild() BOOL LLFloaterMap::postBuild()
{ {
mMap = getChild<LLNetMap>("Net Map"); mMap = getChild<LLNetMap>("Net Map");
mMap->setScale(gSavedSettings.getF32("MiniMapScale"));
mMap->setToolTipMsg(getString("ToolTipMsg")); mMap->setToolTipMsg(getString("ToolTipMsg"));
sendChildToBack(mMap); sendChildToBack(mMap);
...@@ -296,7 +295,6 @@ void LLFloaterMap::handleZoom(const LLSD& userdata) ...@@ -296,7 +295,6 @@ void LLFloaterMap::handleZoom(const LLSD& userdata)
scale = LLNetMap::MAP_SCALE_MIN; scale = LLNetMap::MAP_SCALE_MIN;
if (scale != 0.0f) if (scale != 0.0f)
{ {
gSavedSettings.setF32("MiniMapScale", scale );
mMap->setScale(scale); mMap->setScale(scale);
} }
} }
......
...@@ -94,10 +94,12 @@ LLNetMap::LLNetMap (const Params & p) ...@@ -94,10 +94,12 @@ LLNetMap::LLNetMap (const Params & p)
mToolTipMsg() mToolTipMsg()
{ {
mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS); mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
setScale(gSavedSettings.getF32("MiniMapScale"));
} }
LLNetMap::~LLNetMap() LLNetMap::~LLNetMap()
{ {
gSavedSettings.setF32("MiniMapScale", mScale);
} }
void LLNetMap::setScale( F32 scale ) void LLNetMap::setScale( F32 scale )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment