Automated merge with http://hg.secondlife.com/viewer-development

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);
-}