summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-01-06 16:43:57 -0800
committerleyla_linden <none@none>2011-01-06 16:43:57 -0800
commit523722652259d37841be2ad4ad283df4887ad372 (patch)
tree3872f4235183254667bb0452ff5faf6554c7c69c /indra/newview/llnetmap.cpp
parentf243f7e550b9dadd26d119bfeb4b215aa809997c (diff)
parentd8cf705d0189ec34b1202ee50ea3e5991cf4c90f (diff)
Merge
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 )