summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2022-05-20 11:56:31 -0700
committerCosmic Linden <cosmic@lindenlab.com>2022-05-20 11:56:31 -0700
commit6fb787cd10ea840a9d099715e7462bb5f29c5e6b (patch)
treef48405f125702409ff677724cb56b183f64a67f6
parenteaf9171aca0f1073674a009548fc86eb2d623c4b (diff)
SL-17463: Set the default for MiniMapRotate back to true (enable minimap rotation by default), but set MiniMapRotate to false for new installs
-rw-r--r--indra/newview/app_settings/settings.xml5
-rwxr-xr-xindra/newview/llnetmap.cpp7
2 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 74241823f4..f2943c5c03 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6797,7 +6797,10 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <!-- *HACK: On first run, set this to 0 for new users,
+ otherwise the default is 1 to maintain consistent experience
+ for existing users. Hardcoded in llnetmap.cpp -->
+ <integer>1</integer>
</map>
<key>MiniMapScale</key>
<map>
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 5cae3ce8d6..fa901fbdfd 100755
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -106,6 +106,13 @@ LLNetMap::LLNetMap (const Params & p)
mPopupMenu(NULL)
{
mScale = gSavedSettings.getF32("MiniMapScale");
+ if (gAgent.isFirstLogin())
+ {
+ // *HACK: On first run, set this to false for new users, otherwise the
+ // default is true to maintain consistent experience for existing
+ // users.
+ gSavedSettings.setBOOL("MiniMapRotate", false);
+ }
mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
}