diff options
Diffstat (limited to 'indra/newview/llweb.cpp')
-rw-r--r-- | indra/newview/llweb.cpp | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index a5691d8a1c..781f8298f7 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -35,10 +35,30 @@ #include "llweb.h" -#include "llviewerwindow.h" +// Library includes +#include "llwindow.h" // spawnWebBrowser() +#include "llviewerwindow.h" #include "llviewercontrol.h" #include "llfloaterhtmlhelp.h" +#include "llalertdialog.h" + +class URLLoader : public LLAlertDialog::URLLoader +{ + virtual void load(const std::string& url , bool force_open_externally) + { + if (force_open_externally) + { + LLWeb::loadURLExternal(url); + } + else + { + LLWeb::loadURL(url); + } + } +}; +static URLLoader sAlertURLLoader; + // static void LLWeb::initClass() @@ -93,12 +113,3 @@ std::string LLWeb::escapeURL(const std::string& url) } return escaped_url; } - -// virtual -void LLWeb::URLLoader::load(const std::string& url) -{ - loadURL(url); -} - -// static -LLWeb::URLLoader LLWeb::sAlertURLLoader; |