diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:05:53 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-09 17:05:53 -0700 |
commit | 011c3686a6e10edfe40adb67105298033188c1d6 (patch) | |
tree | 8e45584e245d4f31429703a52da2bf0124d93d04 /indra/newview/llweb.h | |
parent | bd708f82bd3b87051e03a2794ce417ae6f432c08 (diff) | |
parent | a11a8c4027eb949c8a33951b9e8c7475e59a2eeb (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llweb.h')
-rw-r--r-- | indra/newview/llweb.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h index 1119b80bb4..20c7391dbf 100644 --- a/indra/newview/llweb.h +++ b/indra/newview/llweb.h @@ -49,11 +49,14 @@ public: static void initClass(); /// Load the given url in the user's preferred web browser - static void loadURL(const std::string& url); + static void loadURL(const std::string& url, const std::string& target); + static void loadURL(const std::string& url) { loadURL(url, LLStringUtil::null); } /// Load the given url in the user's preferred web browser - static void loadURL(const char* url) { loadURL( ll_safe_string(url) ); } + static void loadURL(const char* url, const std::string& target) { loadURL( ll_safe_string(url), target); } + static void loadURL(const char* url) { loadURL( ll_safe_string(url), LLStringUtil::null ); } /// Load the given url in the Second Life internal web browser - static void loadURLInternal(const std::string &url); + static void loadURLInternal(const std::string &url, const std::string& target); + static void loadURLInternal(const std::string &url) { loadURLInternal(url, LLStringUtil::null); } /// 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); |