summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerhelp.cpp
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-12-04 14:31:15 -0800
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-12-04 14:31:15 -0800
commit40e78a80cc293874216cdc8730d93cba8e987052 (patch)
tree1d16ec375ef2b0dfd9c7a3363cd46575c457a033 /indra/newview/llviewerhelp.cpp
parent18e20ca6f2cb7d51d4d7e7d9566b0018025a91cc (diff)
parentf5a47417fde70f78b99744386c6da0bcf78e60d5 (diff)
Pull and merge viewer-development
Diffstat (limited to 'indra/newview/llviewerhelp.cpp')
-rw-r--r--indra/newview/llviewerhelp.cpp6
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())