summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterhelpbrowser.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-05-02 09:05:56 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-05-02 09:05:56 -0700
commitf393774caf49313f24d33cb2b33b6ad92c70977f (patch)
treeebdaf44b4c3152362f3e9b18c227bd09d39031d5 /indra/newview/llfloaterhelpbrowser.cpp
parent31e16be0daa10e6d66b133c308130524a7a0d881 (diff)
parentb9bb792c478d703c6442351ecb563c0a67f77111 (diff)
Merge from lindenlab/viewer-development
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);