summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-06-14 14:48:50 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-06-14 14:48:50 +0300
commit5baaf1f8e7043ddc6ba1b3d302c272c2ef9b7451 (patch)
treea0c55dc2e0dc9e38b2dabfae0a497a517c013e35 /indra/newview/app_settings/settings.xml
parent0904b13cbb2b50a77a1ee34d40a7f5d76df148d3 (diff)
parente79b9d9bab9c18c05cccbff1ae5869377b303560 (diff)
Merge from default branch
--HG-- branch : product-engine
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 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>