diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-26 15:01:57 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-26 15:01:57 -0800 |
| commit | 8076f7a33d7f5ee93d4ba8f71a7ba0fed5e364a7 (patch) | |
| tree | 6a7d0f88666e16948e73d1098c99edc7513b6e49 /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | 7ca2508cc2adcdc5201bd53e814246e156bc6013 (diff) | |
| parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) | |
Pull merge from richard/viewer-chui
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 |