diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-09 14:20:19 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-09 14:20:19 -0400 |
| commit | 8a952e42e97cfb286192aba0fbfc43986912cd29 (patch) | |
| tree | 6aa00aad42189239aa81972328e057afc215bf7d /indra/newview/llviewerhelp.cpp | |
| parent | c47b398b75fcdbb479ad9ad2765014c5fa338df7 (diff) | |
| parent | 89b9800579a37fbbdfca7789716a2d012d96cfa5 (diff) | |
Removed some spurious newlines that I introduced into CMakeLists.txt.
Diffstat (limited to 'indra/newview/llviewerhelp.cpp')
| -rw-r--r-- | indra/newview/llviewerhelp.cpp | 16 |
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 |