diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 15:14:39 -0500 |
| commit | 4652e26196ed43e3a2fdd5bbb2e6c4b6b8466719 (patch) | |
| tree | de6ce52d54764b0cf7d0c33d17d1cd7e71ffad1b /indra/newview/llweb.h | |
| parent | 3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 (diff) | |
| parent | 2d6228b4e0454c7d82770748eb572258c402319c (diff) | |
merge changes for storm-869
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 |