summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2017-02-14 13:37:45 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2017-02-14 13:37:45 +0200
commit67edb011b5b803c21652c9735e03a387f26a77d5 (patch)
tree160693fae64cde2466ea0aa5aced0fc20bfda300 /indra/newview/app_settings
parent85c24a489dd0550db253f442fc5e22a6494b7cd7 (diff)
MAINT-7104 Flash toolbar when grid status page is updated
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/commands.xml1
-rw-r--r--indra/newview/app_settings/settings.xml33
2 files changed, 34 insertions, 0 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 64cd11a53a..412d3a53b3 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -294,6 +294,7 @@
/>
<command name="gridstatus"
available_in_toybox="true"
+ is_flashing_allowed="true"
icon="Command_Grid_Status_Icon"
label_ref="Command_Grid_Status_Label"
tooltip_ref="Command_Grid_Status_Tooltip"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e96401b511..fb644d3d5a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5163,6 +5163,39 @@
<key>Value</key>
<string>http://wiki.secondlife.com/wiki/[LSL_STRING]</string>
</map>
+ <key>GridStatusRSS</key>
+ <map>
+ <key>Comment</key>
+ <string>URL that points to SL Grid Status RSS</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>https://secondlife-status.statuspage.io/history.atom</string>
+ </map>
+ <key>GridStatusUpdateDelay</key>
+ <map>
+ <key>Comment</key>
+ <string>Timer delay for updating Grid Status RSS.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>60.0</real>
+ </map>
+ <key>TestGridStatusRSSFromFile</key>
+ <map>
+ <key>Comment</key>
+ <string>For testing only: Don't update rss xml file from server.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>LagMeterShrunk</key>
<map>
<key>Comment</key>