summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-01-07 10:48:38 -0800
committerDon Kjer <don@lindenlab.com>2011-01-07 10:48:38 -0800
commit829c2c86975dd80d13008c38246fa8ea0d10529c (patch)
treee90bda161771de9f3fcd98e2806e8eed7c4222fc /indra/newview/llnetmap.cpp
parenta9bc51e6416dd637080c0307de99d5e09d06dcc4 (diff)
parentc132d20a7433e2d09e3521a15497f661fcbd18b8 (diff)
Merge from viewer-development
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 )