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.h | |
| parent | 5861a2faf2b5e5bf88bc5732e6a77406e3fcbaef (diff) | |
| parent | 7b801ca15de795c12b81a0e348d145881168e8ef (diff) | |
automated 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); |