Merge

1 files changed, 3 insertions, 13 deletions

diff --git a/indra/newview/llviewerhelp.cpp b/indra/newview/llviewerhelp.cpp
index 9fe8c142b9..3a3d4f3881 100644
--- a/indra/newview/llviewerhelp.cpp
+++ b/indra/newview/llviewerhelp.cpp
@@ -101,8 +101,9 @@ void LLViewerHelp::showTopic(const std::string &topic)
 
 	// work out the URL for this topic and display it 
 	showHelp();
+	
 	std::string helpURL = LLViewerHelpUtil::buildHelpURL( help_topic );
-	setRawURL( helpURL );
+	setRawURL(helpURL);
 }
 
 std::string LLViewerHelp::defaultTopic()
@@ -148,18 +149,7 @@ std::string LLViewerHelp::getTopicFromFocus()
 // static 
 void LLViewerHelp::showHelp()
 {
-	LLFloaterHelpBrowser* helpbrowser = dynamic_cast<LLFloaterHelpBrowser*>(LLFloaterReg::getInstance("help_browser"));
-	if (helpbrowser)
-	{
-		BOOL visible = TRUE;
-		BOOL take_focus = TRUE;
-		helpbrowser->setVisible(visible);
-		helpbrowser->setFrontmost(take_focus);
-	}
-	else
-	{
-		llwarns << "Eep, help_browser floater not found" << llendl;
-	}
+	LLFloaterReg::showInstance("help_browser");
 }
 
 // static