summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorcallum <none@none>2011-03-17 17:18:58 -0700
committercallum <none@none>2011-03-17 17:18:58 -0700
commitb3e444c74e0f31ba9d63d7bed934f017bf2499df (patch)
treefb02d73ab7327d13e288cd952c34d9c9986112eb /indra/newview/app_settings/settings.xml
parent3f64343b0b078e481c1c852ccd7201be6826a110 (diff)
SOCIAL-634 FIX Error condition content for Destination Guide, Avatar Picker,
and Help if S3 content or web content is not available. (Included refs to new LLQtWebKit that supports functionality)
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 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>