summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.h
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-03-29 15:28:48 -0700
committerRichard Nelson <none@none>2010-03-29 15:28:48 -0700
commite50586043b3920864d58bb2243d977705d6669aa (patch)
tree6bf311b77bdce138816f9d74f071bff5e1058531 /indra/newview/llweb.h
parentd98b2ce4865dc90e635fe75d676e4965bccfa793 (diff)
EXT-3258 - Viewer freezes while external web browser loads page
reviewed by Callum
Diffstat (limited to 'indra/newview/llweb.h')
-rw-r--r--indra/newview/llweb.h4
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);