summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.h
diff options
context:
space:
mode:
authorcallum <none@none>2010-11-30 20:52:30 -0800
committercallum <none@none>2010-11-30 20:52:30 -0800
commit522bcf17b759910040225c209f7851fbb0640c56 (patch)
treed0d34d779b28b6c31901aec3f52ce4d08a3d3800 /indra/newview/llweb.h
parent1345cbb0ca715de8bc98a1ccffd93f29d749500a (diff)
SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be useful for viewer web apps
Diffstat (limited to 'indra/newview/llweb.h')
-rw-r--r--indra/newview/llweb.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h
index 2915376583..3fe5a4dcad 100644
--- a/indra/newview/llweb.h
+++ b/indra/newview/llweb.h
@@ -57,6 +57,10 @@ 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 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