diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:10:39 -0500 |
| commit | 7c7527b6727a6070fd7679ea28e4e2692452bf27 (patch) | |
| tree | 149af6391cf0e751488964871e8bfcf62adbb160 /indra/newview/llnetmap.cpp | |
| parent | df1c6d2a2e4ccfe7bd19a66ba95c4f7bc6edee5e (diff) | |
| parent | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (diff) | |
Automated merge up from viewer-development
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 ) |