summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-04-17 08:43:14 -0700
committerGraham Linden <graham@lindenlab.com>2019-04-17 08:43:14 -0700
commitf14888b6166f91533e778e94701b74a9639ebefd (patch)
tree75f956b904bdbd774206534416dd6c5119da6a8f /indra/newview/app_settings
parentb8115d43c95504afa0a15a091e3d1ab389c71366 (diff)
parent81dbd3663bdaff741e68de0ec4d4d35bedf6649d (diff)
Merge 6.2.1
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1173abf18e..7b69ec6eb2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16288,6 +16288,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>ResetUIScaleOnFirstRun</key>
+ <map>
+ <key>Comment</key>
+ <string>Resets the UI scale factor on first run due to changed display scaling behavior</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
</map>
</llsd>