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.h | |
| parent | 114e5ca0839bace7f247a6eadb6e06a28597501d (diff) | |
| parent | e50586043b3920864d58bb2243d977705d6669aa (diff) | |
merge
Diffstat (limited to 'indra/newview/llweb.h')
| -rw-r--r-- | indra/newview/llweb.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h index f4666c9280..1119b80bb4 100644 --- a/indra/newview/llweb.h +++ b/indra/newview/llweb.h @@ -54,8 +54,10 @@ public: static void loadURL(const char* url) { loadURL( ll_safe_string(url) ); } /// Load the given url in the Second Life internal web browser static void loadURLInternal(const std::string &url); - /// Load the given url in the operating system's web browser + /// Load the given url in the operating system's web browser, async if we want to return immediately + /// before browser has spawned static void loadURLExternal(const std::string& url); + static void loadURLExternal(const std::string& url, bool async); /// Returns escaped url (eg, " " to "%20") - used by all loadURL methods static std::string escapeURL(const std::string& url); |