summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-21 15:55:55 -0500
committerOz Linden <oz@lindenlab.com>2011-01-21 15:55:55 -0500
commitd034d8d9289a9e5511d32ec048b75837b89264ad (patch)
treec3fd25eb7d1096baef0290b5bf86321f7ed447ad /indra/newview/llnetmap.cpp
parent6150e4ed7cf86a2afc0061ba89b0cb049d6f036e (diff)
parent97a9211d87fac90994846e5bf91a78a708ec5a9c (diff)
merge changes for vwr-24347
Diffstat (limited to 'indra/newview/llnetmap.cpp')
-rw-r--r--indra/newview/llnetmap.cpp2
1 files changed, 2 insertions, 0 deletions
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 )