diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-30 11:50:41 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-30 11:50:41 -0400 |
| commit | 9ec2e869290b6a89ab4de1b7b5d803dc420d88f6 (patch) | |
| tree | fc1769f582ff9571b19d181c2cf7a6355f4bcd03 /indra/newview/llweb.cpp | |
| parent | 5861a2faf2b5e5bf88bc5732e6a77406e3fcbaef (diff) | |
| parent | 7b801ca15de795c12b81a0e348d145881168e8ef (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llweb.cpp')
| -rw-r--r-- | indra/newview/llweb.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index 3385b75c65..1a64f9d881 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -103,8 +103,18 @@ void LLWeb::loadURLInternal(const std::string &url) // static void LLWeb::loadURLExternal(const std::string& url) { + loadURLExternal(url, true); +} + + +// static +void LLWeb::loadURLExternal(const std::string& url, bool async) +{ std::string escaped_url = escapeURL(url); - gViewerWindow->getWindow()->spawnWebBrowser(escaped_url); + if (gViewerWindow) + { + gViewerWindow->getWindow()->spawnWebBrowser(escaped_url, async); + } } |