diff options
| author | Sabrina Shanman <cosmic@lindenlab.com> | 2022-04-05 20:22:24 +0000 |
|---|---|---|
| committer | Sabrina Shanman <cosmic@lindenlab.com> | 2022-04-05 20:22:24 +0000 |
| commit | c7d137067cae548bca919d0f0b49e4818d4fed31 (patch) | |
| tree | 0aed533fedae6de3e703a91effba9e63f5feaea8 /indra/newview/llappviewer.cpp | |
| parent | 268da741927ddde059fad4a47940fa050c9e0f4e (diff) | |
| parent | 9bca1aa8fb69c2163866dd7e5ce3b60fb62676b3 (diff) | |
Merged in SL-15232 (pull request #933)
SL-15232: Scroll mouse wheel to main map
Approved-by: Andrey Lihatskiy
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 254bf05d05..a06a9eb9fe 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -589,7 +589,7 @@ static void settings_to_globals() gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc"); gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates"); - LLWorldMapView::sMapScale = gSavedSettings.getF32("MapScale"); + LLWorldMapView::setScaleSetting(gSavedSettings.getF32("MapScale")); #if LL_DARWIN gHiDPISupport = gSavedSettings.getBOOL("RenderHiDPI"); @@ -3404,7 +3404,7 @@ void LLAppViewer::cleanupSavedSettings() } } - gSavedSettings.setF32("MapScale", LLWorldMapView::sMapScale ); + gSavedSettings.setF32("MapScale", LLWorldMapView::getScaleSetting()); // Some things are cached in LLAgent. if (gAgent.isInitialized()) |