diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
| commit | 894e98a708f4135cb4543b95ce46c2b8c4929393 (patch) | |
| tree | 2055d289ca6c55eacb300feddb38b2935e8ae132 /indra/newview/llnetmap.cpp | |
| parent | 1ca028cd7b2b4a169cdc776dfa4b38b2fcb76440 (diff) | |
| parent | 94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (diff) | |
merge changes for storm-812
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 2 |
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 ) |