diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-06-01 10:06:40 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-06-01 10:06:40 -0700 |
| commit | 592ee60a1367f37e8bc02d9e5ffcc593d01d92e3 (patch) | |
| tree | 4deddc4bc53dcdaea3870e23940ced3387891812 /indra/newview/app_settings | |
| parent | 4cc5c7d2a4511ffc65bf3b6b0b2e29beb5b0fed4 (diff) | |
| parent | 648b55390709f832aac01b914ef4834e40c7b5f9 (diff) | |
Automated merge with http://hg.lindenlab.com/dessie/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 c0be54a105..22c9c92349 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> |