summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-05 16:35:09 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-05 16:35:09 -0500
commitc3501a4f233410ca1740cbe0d29c3be18327ca52 (patch)
tree8a1aa78d76435cbb4e8fe76c2eef81a79de272a0 /indra/newview/llnetmap.cpp
parent3b1a06b02434377a2772def8cc8fc0bf3407837d (diff)
parente2f197b6f77592c84d0c2967cc0e8110c79f2f49 (diff)
Automated 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 )