diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-20 16:20:40 -0800 |
commit | 67bc42a80ac0c125a719e2d48c974f9259c04551 (patch) | |
tree | e76b0c3acf0a53d98fb7a7fbc79d912bbb916588 /indra/newview/llviewerhelp.cpp | |
parent | 1ece38912188650c9bc5a1cf906ca4a88acc21c4 (diff) | |
parent | cca22d608deb26cf21b33629b170e70a0e221575 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/llviewerhelp.cpp')
-rw-r--r-- | indra/newview/llviewerhelp.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llviewerhelp.cpp b/indra/newview/llviewerhelp.cpp index a8a918f259..04c2e27c9d 100644 --- a/indra/newview/llviewerhelp.cpp +++ b/indra/newview/llviewerhelp.cpp @@ -71,12 +71,6 @@ LLHelpHandler gHelpHandler; std::string LLViewerHelp::getURL(const std::string &topic) { - // allow overriding the help server with a local help file - if( gSavedSettings.getBOOL("HelpUseLocal") ) - { - return "__local"; - } - // if the help topic is empty, use the default topic std::string help_topic = topic; if (help_topic.empty()) |