diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 14:37:38 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 14:37:38 -0500 |
| commit | 852e60859977a6a2b088d8c99ae7350fe3a3d587 (patch) | |
| tree | 2cc2f438c657cc554c64bc1e6248a4f716b99a29 /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | 0e13bf5f9ebfb29cc40470df5088ecde4d3ec20f (diff) | |
| parent | 120733ea0d479f3c0224f94bb17e5dc32194dc9f (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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 |