summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-12-13 02:21:48 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-12-13 02:21:48 +0200
commitb0265f97563efc5b6e95b9f14352878185c1be05 (patch)
treec571caa58a448775d502bb122a26e67da6d60e5b /indra/newview/app_settings/settings.xml
parent5f86203f261b376ad74814e1e635dba077c7718b (diff)
parentd656d49a77eeb65ae537c954ea4009bc22da7b2b (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml24
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 86c3e6cf3f..5be89c92a8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5334,7 +5334,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>https://secondlife-status.statuspage.io/history.atom</string>
+ <string>https://status.secondlifegrid.net/history.atom</string>
</map>
<key>GridStatusUpdateDelay</key>
<map>
@@ -11249,6 +11249,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>BasicUITooltips</key>
+ <map>
+ <key>Comment</key>
+ <string>Show tooltips for various 2D UI elements like buttons or checkboxes, won't supress tooltips like drag'n'drop, inworld, links or media</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>ShowHoverTips</key>
<map>
<key>Comment</key>
@@ -13163,6 +13174,17 @@
<key>Value</key>
<real>3</real>
</map>
+ <key>HUDScaleFactor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scale of HUD attachments</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>1.0</real>
+ </map>
<key>UIScaleFactor</key>
<map>
<key>Comment</key>