summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterhelpbrowser.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-04-20 11:23:39 -0400
committerLoren Shih <seraph@lindenlab.com>2011-04-20 11:23:39 -0400
commit38306a2bbbcaaa0825db88aab39f7d10943f9af3 (patch)
treeab5f360c6537510303da006a7678124c3134613b /indra/newview/llfloaterhelpbrowser.cpp
parent6715603b6a991f822274b000e5d8fb9b8d405464 (diff)
parentda7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff)
automated merge viewer-pre-beta -> seraph-viewer-pre-beta
Diffstat (limited to 'indra/newview/llfloaterhelpbrowser.cpp')
-rw-r--r--indra/newview/llfloaterhelpbrowser.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp
index a650886d89..627defd006 100644
--- a/indra/newview/llfloaterhelpbrowser.cpp
+++ b/indra/newview/llfloaterhelpbrowser.cpp
@@ -50,6 +50,7 @@ BOOL LLFloaterHelpBrowser::postBuild()
{
mBrowser = getChild<LLMediaCtrl>("browser");
mBrowser->addObserver(this);
+ mBrowser->setErrorPageURL(gSavedSettings.getString("GenericErrorPageURL"));
childSetAction("open_browser", onClickOpenWebBrowser, this);