diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 14:37:38 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 14:37:38 -0500 |
| commit | 852e60859977a6a2b088d8c99ae7350fe3a3d587 (patch) | |
| tree | 2cc2f438c657cc554c64bc1e6248a4f716b99a29 /indra/newview/llviewerhelp.cpp | |
| parent | 0e13bf5f9ebfb29cc40470df5088ecde4d3ec20f (diff) | |
| parent | 120733ea0d479f3c0224f94bb17e5dc32194dc9f (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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()) |