summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-06-14 10:55:25 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-06-14 10:55:25 -0700
commitbaf9b3cb078c04b019fccc4ae8a54db05b14bdef (patch)
treeaa422043ec900036716d35e73240efc9df152d32 /indra/newview/app_settings
parent76cf9e29a77566c10da6184833fad6b0912e9688 (diff)
parentfbc95fe7e77ed093f8f7938a4755ce6b175dcaff (diff)
Merge
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 d4aebe6cb1..4506ee6e0c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1,6 +1,17 @@
<?xml version="1.0" ?>
<llsd>
<map>
+ <key>CrashHostUrl</key>
+ <map>
+ <key>Comment</key>
+ <string>A URL pointing to a crash report handler; overrides cluster negotiation to locate crash handler.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string />
+ </map>
<key>AFKTimeout</key>
<map>
<key>Comment</key>