summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-06-11 18:25:51 +0100
committerLynx Linden <lynx@lindenlab.com>2010-06-11 18:25:51 +0100
commit8c9587225a68f9b6276f08691d1a0ddbe67edd9a (patch)
treecb1929fc8b24b4abef902c7fb7b04b40024778b3 /indra/newview/app_settings
parent8e725a8694f8537d696a6943ea2323c56a5fa169 (diff)
parentb181dc15217c2fef234e308063d313d33ecb9df7 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-release
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>