diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-01 18:19:45 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-01 18:19:45 -0700 |
| commit | dde2153014cd7d7b8fa704f7067a41344bfbb1c2 (patch) | |
| tree | f7633ccef179644660897c8bf3684abeda3545f8 /indra/newview/llurldispatcher.cpp | |
| parent | 9b8b0571645f8b607ecc24221c807cc02a03692f (diff) | |
| parent | 85ea690d47208f6dda020c8ff81021179fbdd0b8 (diff) | |
merge of latest lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
| -rw-r--r-- | indra/newview/llurldispatcher.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index 901d0594f1..e7a8ad6605 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -37,7 +37,7 @@ #include "llagent.h" // teleportViaLocation() #include "llcommandhandler.h" #include "llfloaterdirectory.h" -#include "llfloatermediabrowser.h" +#include "llfloaterhelpbrowser.h" #include "llfloaterreg.h" #include "llfloaterurldisplay.h" #include "llfloaterworldmap.h" @@ -105,7 +105,7 @@ bool LLURLDispatcherImpl::dispatchCore(const std::string& url, bool trusted_browser) { if (url.empty()) return false; - if (dispatchHelp(url, right_mouse)) return true; + //if (dispatchHelp(url, right_mouse)) return true; if (dispatchApp(url, right_mouse, web, trusted_browser)) return true; if (dispatchRegion(url, right_mouse)) return true; @@ -140,19 +140,6 @@ bool LLURLDispatcherImpl::dispatchRightClick(const std::string& url) } // static -bool LLURLDispatcherImpl::dispatchHelp(const std::string& url, bool right_mouse) -{ -#if LL_LIBXUL_ENABLED - if (LLSLURL::isURLHelp(url)) - { - gViewerHtmlHelp.show(); - return true; - } -#endif - return false; -} - -// static bool LLURLDispatcherImpl::dispatchApp(const std::string& url, bool right_mouse, LLMediaCtrl* web, |