diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:53:37 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:53:37 -0500 |
| commit | eb0b8ab3ea19617a52881191bab21bfedcc5696d (patch) | |
| tree | 769aa9bd60f45109f54672db93a4fa22fcde6510 /indra/newview/llnetmap.cpp | |
| parent | df0a0312fb1923164c6d693c675a365bb8cef1df (diff) | |
| parent | d5a0c56bf5d933b7cee072cbc1851a626e672ded (diff) | |
merge changes for storm-825
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 ) |