diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:17:38 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:17:38 -0700 |
| commit | ec23ec68ea8835e4155e083ec5570245b0aef1ec (patch) | |
| tree | 157ff142523382a6756ebc508a98362891a850e7 /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | 7e13856df2c60a7e011df01459a3a085a3a4a82a (diff) | |
EXP-1310 FIX Profile button should open Web Profile floater
removed unused LLWeb functions for opening non-web media
moved logic inside floaters and away from auxiliary functions
Diffstat (limited to 'indra/newview/llfloaterhelpbrowser.cpp')
| -rw-r--r-- | indra/newview/llfloaterhelpbrowser.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp index 3012638d44..fd9c37ae73 100644 --- a/indra/newview/llfloaterhelpbrowser.cpp +++ b/indra/newview/llfloaterhelpbrowser.cpp @@ -39,6 +39,7 @@ #include "llurlhistory.h" #include "llmediactrl.h" #include "llviewermedia.h" +#include "llviewerhelp.h" LLFloaterHelpBrowser::LLFloaterHelpBrowser(const LLSD& key) @@ -74,6 +75,17 @@ void LLFloaterHelpBrowser::buildURLHistory() 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)); + } } //virtual @@ -148,8 +160,3 @@ void LLFloaterHelpBrowser::openMedia(const std::string& media_url) mBrowser->navigateTo(media_url, "text/html"); setCurrentURL(media_url); } - -void LLFloaterHelpBrowser::navigateToLocalPage( const std::string& subdir, const std::string& filename_in ) -{ - mBrowser->navigateToLocalPage(subdir, filename_in); -} |