diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:54:12 -0500 |
| commit | 1034db639462d95e54e9bf9e4d63500b745bb0a2 (patch) | |
| tree | 68b010fb3f9f2c4b67e59187d125090b1c69d72f /indra/newview/llnetmap.cpp | |
| parent | 0eb491417e8479516b07cc9237242b60d36d10f5 (diff) | |
| parent | eb0b8ab3ea19617a52881191bab21bfedcc5696d (diff) | |
merge changes for storm-806
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 ) |