diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:51:16 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:51:16 -0800 |
| commit | 598450785b9d0cfd1254e39a68fe8f5c889ac509 (patch) | |
| tree | 9145aef1e6e4b69386d313f427bc637630991848 /indra/newview/llweb.h | |
| parent | 36954908632d6f5366f6517023676c1bcd71aa17 (diff) | |
| parent | adb62e958ff3a4be2eb43fbb1754358ec60a118c (diff) | |
merge
Diffstat (limited to 'indra/newview/llweb.h')
| -rw-r--r-- | indra/newview/llweb.h | 4 |
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 |