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/llwindow/llwindowmacosx.cpp | |
parent | 5861a2faf2b5e5bf88bc5732e6a77406e3fcbaef (diff) | |
parent | 7b801ca15de795c12b81a0e348d145881168e8ef (diff) |
automated merge
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
-rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 022b97f481..7026a3f7a6 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -3178,7 +3178,7 @@ S32 OSMessageBoxMacOSX(const std::string& text, const std::string& caption, U32 // Open a URL with the user's default web browser. // Must begin with protocol identifier. -void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url) +void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url, bool async) { bool found = false; S32 i; |