summaryrefslogtreecommitdiff
path: root/indra/newview/llnetmap.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2011-01-05 15:52:43 -0800
committercallum <none@none>2011-01-05 15:52:43 -0800
commitb9ca6c553cf158c5b485947f8b560228a196c1d7 (patch)
treedf710eb467a1c0fbfb5d7906232f23a36f6fc7c1 /indra/newview/llnetmap.cpp
parented3ea14984e322462ed466805e47b29a6f658279 (diff)
parentd5a0c56bf5d933b7cee072cbc1851a626e672ded (diff)
Merge with 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 )