diff options
| author | Richard Linden <none@none> | 2011-04-01 14:13:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-01 14:13:05 -0700 |
| commit | 878b0e2da1b91f06757b349640e1ac22bccb3a55 (patch) | |
| tree | 0cb57ebd49ad77879d02181998938730fffa3954 /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
| parent | 84f242ff4fc7743e909f53695a4e7a51c3c60299 (diff) | |
Automated merge with http://bitbucket.org/merov_linden/viewer-autobuild2010
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); |