summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-06-07 12:14:13 +0100
committerLynx Linden <lynx@lindenlab.com>2010-06-07 12:14:13 +0100
commit185cd5d261a4bc6e02f49f40c72d76da4320a881 (patch)
treec08ae4afb5e79f6b90bfe085a32b4d3e6e16a070 /indra/newview/app_settings/settings.xml
parenteec00a712fff079009ae793d86e27b7f3ab13053 (diff)
parentedd224dc7b08ad72c0f36c5b0f24912fdf66ab1c (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-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 53af87a870..1c5e2435de 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>