summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-14 15:34:39 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-14 15:34:39 +0300
commit0573e7e584236a7f7092ca068a6f816bc7f18c6f (patch)
treef044e6efb1f6368ae1ec5455acae004c5915cab7 /indra/newview/app_settings
parentfdeb1a5c76e532ad8035963094a7fe98c998b176 (diff)
parente96544ff266849207adfc3823adfc2dcfe42ce72 (diff)
merge
--HG-- branch : product-engine
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>