diff options
| author | Richard Nelson <none@none> | 2010-03-29 15:29:12 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-03-29 15:29:12 -0700 |
| commit | eeeca917975e11bfe4b42a6b3c9c23cd63f2fe2e (patch) | |
| tree | 523ce33dd89d2d24e936baa11a0b8263c668ce49 /indra/newview/llweb.cpp | |
| parent | 114e5ca0839bace7f247a6eadb6e06a28597501d (diff) | |
| parent | e50586043b3920864d58bb2243d977705d6669aa (diff) | |
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); + } } |