From a57729b9260ce5e711bff47c02ca54ab65eade27 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 22 Mar 2011 13:58:27 -0700
Subject: SOCIAL-634 FIX Error condition content for Destination Guide, Avatar
 Picker,             and Help if S3 content or web content is not available

---
 indra/newview/llviewerwindow.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llviewerwindow.cpp')

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 6bf363bf68..b71eebc30f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1791,11 +1791,13 @@ void LLViewerWindow::initWorldUI()
 	LLMediaCtrl* avatar_picker = avatar_picker_destination_guide_container->findChild<LLMediaCtrl>("avatar_picker_contents");
 	if (destinations)
 	{
+		destinations->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
 		destinations->navigateTo(gSavedSettings.getString("DestinationGuideURL"), "text/html");
 	}
 
 	if (avatar_picker)
 	{
+		avatar_picker->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
 		avatar_picker->navigateTo(gSavedSettings.getString("AvatarPickerURL"), "text/html");
 	}
 
-- 
cgit v1.2.3