diff options
author | Lynx Linden <lynx@lindenlab.com> | 2010-06-10 18:57:18 +0100 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2010-06-10 18:57:18 +0100 |
commit | 5f8cc41e798daecb481cbabdbbd080a53f5253a6 (patch) | |
tree | d8f67746607e592e1002b3b4a1a77269d0b3892f /indra/newview/app_settings | |
parent | 9370ffac47665c309c28fb075b26d8da43192e23 (diff) | |
parent | f2f7f7b3bb2c8466e2a07f8f586a1a63fdae8a66 (diff) |
Merging latest dessie/viewer-release into brad/viewer-public
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
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> |