summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:46:09 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:46:09 -0500
commite2f197b6f77592c84d0c2967cc0e8110c79f2f49 (patch)
treec405316265ca4248802817b8a99697063c58469d /indra/newview/llweb.h
parent2d9c970babf6bab8d402482315af6be0ffb198dd (diff)
parent78895f9e0c628dc33268578faf135e967cf30142 (diff)
merge changes for storm-398
Diffstat (limited to 'indra/newview/llweb.h')
-rw-r--r--indra/newview/llweb.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h
index 2915376583..dc5958e57f 100644
--- a/indra/newview/llweb.h
+++ b/indra/newview/llweb.h
@@ -57,6 +57,11 @@ public:
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);
+ // Explicitly open a Web URL using the Web content floater vs. the more general media browser
+ static void loadWebURL(const std::string& url, const std::string& target, const std::string& uuid);
+ static void loadWebURLInternal(const std::string &url, const std::string& target, const std::string& uuid);
+ static void loadWebURLInternal(const std::string &url) { loadWebURLInternal(url, LLStringUtil::null, LLStringUtil::null); }
+
/// Returns escaped url (eg, " " to "%20") - used by all loadURL methods
static std::string escapeURL(const std::string& url);
/// Expands various strings like [LANG], [VERSION], etc. in a URL