summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerhelp.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2009-12-15 17:53:03 -0800
committercallum <none@none>2009-12-15 17:53:03 -0800
commitb7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch)
tree7edef8c608cc99cb0e657694d259598294858851 /indra/newview/llviewerhelp.cpp
parentf923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff)
parentfc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff)
Merge with tip before push
Diffstat (limited to 'indra/newview/llviewerhelp.cpp')
-rw-r--r--indra/newview/llviewerhelp.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerhelp.cpp b/indra/newview/llviewerhelp.cpp
index b8f91697e5..5af79b4fd3 100644
--- a/indra/newview/llviewerhelp.cpp
+++ b/indra/newview/llviewerhelp.cpp
@@ -81,8 +81,7 @@ void LLViewerHelp::showTopic(const std::string &topic)
// work out the URL for this topic and display it
showHelp();
- const LLOSInfo& osinfo = LLAppViewer::instance()->getOSInfo();
- std::string helpURL = LLViewerHelpUtil::buildHelpURL( help_topic, gSavedSettings, osinfo );
+ std::string helpURL = LLViewerHelpUtil::buildHelpURL( help_topic );
setRawURL( helpURL );
}