diff options
| author | leyla_linden <none@none> | 2010-12-31 12:55:04 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2010-12-31 12:55:04 -0800 |
| commit | 350a736d37de282e1e3c22627400d957f0e00dc5 (patch) | |
| tree | 7427e593ce39ad2c50e1f217bad5b211a9eb3928 /indra/newview/llweb.h | |
| parent | d196348d0f4bd542eee3702329dab28952b8a5e5 (diff) | |
| parent | e3204165b9bb9b36cb11a8d0a4a4040634e707fc (diff) | |
Merge
Diffstat (limited to 'indra/newview/llweb.h')
| -rw-r--r-- | indra/newview/llweb.h | 5 |
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 |