diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:24:08 -0500 |
| commit | 623a06aabd9d7e5c7e74211360aa233ec33e4977 (patch) | |
| tree | 21c815db542e45fc07473cd26a24561c5f27add8 /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | d56a98dea4c7523a759bea4740d8bdde1df15e30 (diff) | |
| parent | a9ada0cc6a1418da0908f995b1369912a270b22d (diff) | |
merge release tag
Diffstat (limited to 'indra/newview/llfloaterhelpbrowser.cpp')
| -rw-r--r-- | indra/newview/llfloaterhelpbrowser.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp index fd9c37ae73..4cb632bd6a 100644 --- a/indra/newview/llfloaterhelpbrowser.cpp +++ b/indra/newview/llfloaterhelpbrowser.cpp @@ -77,15 +77,7 @@ void LLFloaterHelpBrowser::onOpen(const LLSD& key) gSavedSettings.setBOOL("HelpFloaterOpen", TRUE); std::string topic = key.asString(); - - if (topic == "__local") - { - mBrowser->navigateToLocalPage( "help-offline" , "index.html" ); - } - else - { - mBrowser->navigateTo(LLViewerHelp::instance().getURL(topic)); - } + mBrowser->navigateTo(LLViewerHelp::instance().getURL(topic)); } //virtual |