From cacaf21eb5657065dc510bf245cf5fddb4f48a19 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Fri, 5 Dec 2014 09:46:07 -0500
Subject: [PATCH] STORM-2088 Minimap no longer remembers zoom setting between
sessions
---
doc/contributions.txt | 1 +
indra/newview/llnetmap.cpp | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index ab5eddd92d1..d071fc0c772 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -718,6 +718,7 @@ Jonathan Yap
STORM-2030
STORM-2034
STORM-2018
+ STORM-2088
Kadah Coba
STORM-1060
STORM-1843
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 1685a18e262..fbd9b127b68 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;
}
--
GitLab