diff options
author | Cosmic Linden <cosmic@lindenlab.com> | 2022-02-18 14:35:59 -0800 |
---|---|---|
committer | Cosmic Linden <cosmic@lindenlab.com> | 2022-04-05 11:55:33 -0700 |
commit | f1b7ba6c284605f2104896d7316e74b1e436e821 (patch) | |
tree | 64aa13ca8b50f9ff76d43c08aa81072f561cfaa8 /indra/newview/llfloatermap.cpp | |
parent | 6013e68ea2d2ca65bac912a295a8521c22a72325 (diff) |
SL-16916: Update minimap context menu with new options and reworded existing options
Map rotation: Split minimap "Rotate Map" context menu option into two options: "North at top" and "Camera at top"
Zoom:
- Adjust minimap context menu zoom presets: New presets are "far", "medium", "close", and "very close"
- Change default minimap zoom level from 128 to 64
- Currently selected minimap zoom level is now checked
About Land: Add "About Land" button to minimap context menu
Reword: Rearrange and adjust capitalization of the various context menu options
Code change: Remove unused zoom handling code in LLFloaterMap
Diffstat (limited to 'indra/newview/llfloatermap.cpp')
-rwxr-xr-x | indra/newview/llfloatermap.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp index 95c43805d4..fd1af7ccc0 100755 --- a/indra/newview/llfloatermap.cpp +++ b/indra/newview/llfloatermap.cpp @@ -248,32 +248,6 @@ void LLFloaterMap::reshape(S32 width, S32 height, BOOL called_from_parent) updateMinorDirections(); } -void LLFloaterMap::handleZoom(const LLSD& userdata) -{ - std::string level = userdata.asString(); - - F32 scale = 0.0f; - if (level == std::string("default")) - { - LLControlVariable *pvar = gSavedSettings.getControl("MiniMapScale"); - if(pvar) - { - pvar->resetToDefault(); - scale = gSavedSettings.getF32("MiniMapScale"); - } - } - else if (level == std::string("close")) - scale = LLNetMap::MAP_SCALE_MAX; - else if (level == std::string("medium")) - scale = LLNetMap::MAP_SCALE_MID; - else if (level == std::string("far")) - scale = LLNetMap::MAP_SCALE_MIN; - if (scale != 0.0f) - { - mMap->setScale(scale); - } -} - LLFloaterMap* LLFloaterMap::getInstance() { return LLFloaterReg::getTypedInstance<LLFloaterMap>("mini_map"); |