diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-14 01:45:59 +0000 |
| commit | 98fd90ddd6595f2ee7e626c14117f51def621ec5 (patch) | |
| tree | 9a9caf8bffa53b753fe850f445bd133195e9bb03 /indra/newview/llurldispatcher.cpp | |
| parent | 89d938efe371645756240da72f4c359c36985060 (diff) | |
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it.
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
| -rw-r--r-- | indra/newview/llurldispatcher.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index 82b2b597ca..9e4f196601 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -39,6 +39,7 @@ #include "llfloaterdirectory.h" #include "llfloaterhtml.h" #include "llfloaterworldmap.h" +#include "llfloaterhtmlhelp.h" #include "llpanellogin.h" #include "llstartup.h" // gStartupState #include "llurlsimstring.h" @@ -159,9 +160,7 @@ bool LLURLDispatcherImpl::dispatchHelp(const std::string& url, BOOL right_mouse) { if (matchPrefix(url, SLURL_SL_HELP_PREFIX)) { -#if LL_LIBXUL_ENABLED gViewerHtmlHelp.show(); -#endif // LL_LIBXUL_ENABLED return true; } return false; |