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/llwindowwin32.h | |
| parent | 5861a2faf2b5e5bf88bc5732e6a77406e3fcbaef (diff) | |
| parent | 7b801ca15de795c12b81a0e348d145881168e8ef (diff) | |
automated merge
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index 9d57735772..d4a3446515 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -114,7 +114,7 @@ public: /*virtual*/ void setLanguageTextInput( const LLCoordGL & pos ); /*virtual*/ void updateLanguageTextInputArea(); /*virtual*/ void interruptLanguageTextInput(); - /*virtual*/ void spawnWebBrowser(const std::string& escaped_url); + /*virtual*/ void spawnWebBrowser(const std::string& escaped_url, bool async); LLWindowCallbacks::DragNDropResult completeDragNDropRequest( const LLCoordGL gl_coord, const MASK mask, LLWindowCallbacks::DragNDropAction action, const std::string url ); |