diff options
| author | Richard Linden <none@none> | 2011-04-06 15:20:51 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-06 15:20:51 -0700 |
| commit | 1d34e7b90bb9b45e20051d777da5d24dc76dbd50 (patch) | |
| tree | 4028d274dd824485f7a97d36a48b92e7ff72b357 /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff) | |
| parent | 75ddf612ad29240d6d34b5044ae09e4295217766 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llfloaterhelpbrowser.cpp')
| -rw-r--r-- | indra/newview/llfloaterhelpbrowser.cpp | 1 |
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); |