summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-05-27 15:40:16 -0700
committerbrad kittenbrink <brad@lindenlab.com>2010-05-27 15:40:16 -0700
commitd9052212b5c575e31ddfe358c228e0ba9a7403ed (patch)
tree1670d0c29894ff18f8a48dcfab99877bddd11eaf /indra/newview/app_settings
parent0c7fafb70425853df26c703969e7a1892de2374e (diff)
parent4e8d423cc5fae86c8273df5e7ea583a9e0475711 (diff)
Merge of latest dessie/viewer-public with brad/viewer-public
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 4ce5358ade..522b02d7ca 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>