summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.h
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-11-15 12:05:05 -0800
committerDessie Linden <dessie@lindenlab.com>2010-11-15 12:05:05 -0800
commit5bfa6095db3a0a9c7367b7dde3f2e24e023cb7f4 (patch)
tree1ab6b0946d7bfb881a2ccfaa2382d24b46a6b729 /indra/newview/llweb.h
parent65d847de38614a67ed1bdd86445c1c80f4638cc3 (diff)
parentc13f6afe73bea4311a91d65dde2f6e1c5bc453b3 (diff)
Added viewer-release.release-viewer.jira parameter to write build comment to DRTVWR-13
Diffstat (limited to 'indra/newview/llweb.h')
-rw-r--r--indra/newview/llweb.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h
index 1ba856babe..2915376583 100644
--- a/indra/newview/llweb.h
+++ b/indra/newview/llweb.h
@@ -43,15 +43,19 @@ 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, const std::string& uuid = LLStringUtil::null);
+ 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, const std::string& uuid = LLStringUtil::null);
+ 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);
- static void loadURLExternal(const std::string& url, bool async);
+ static void loadURLExternal(const std::string& url) { loadURLExternal(url, LLStringUtil::null); };
+ static void loadURLExternal(const std::string& url, const std::string& uuid);
+ static void loadURLExternal(const std::string& url, bool async, const std::string& uuid = LLStringUtil::null);
/// Returns escaped url (eg, " " to "%20") - used by all loadURL methods
static std::string escapeURL(const std::string& url);