diff options
| author | Richard Linden <none@none> | 2011-03-18 11:42:39 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-18 11:42:39 -0700 |
| commit | 097e076a7221f8b25914f1fad61e27ac316915e5 (patch) | |
| tree | 8a57fcda493436d53a8f783a3d874ce39a093f6e /indra/newview/app_settings | |
| parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
| parent | e5a4b145b435396aa2c0d3d9a49019984658cdf4 (diff) | |
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.yibew7\http__hg.secondlife.com_viewer-development_t3uwtb.hg
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 6a89f5681d..c626538808 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12586,5 +12586,16 @@ <key>Value</key> <integer>1</integer> </map> + <key>WebContentFloaterErrorURL</key> + <map> + <key>Comment</key> + <string>URL to navigate to if the Web content floater hits a page with a 400-499 HTTP status code</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/damballah/404.html</string> + </map> </map> </llsd> |