diff options
| author | callum <none@none> | 2010-11-30 20:52:30 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-11-30 20:52:30 -0800 |
| commit | 522bcf17b759910040225c209f7851fbb0640c56 (patch) | |
| tree | d0d34d779b28b6c31901aec3f52ce4d08a3d3800 /indra/newview/llweb.cpp | |
| parent | 1345cbb0ca715de8bc98a1ccffd93f29d749500a (diff) | |
SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be useful for viewer web apps
Diffstat (limited to 'indra/newview/llweb.cpp')
| -rw-r--r-- | indra/newview/llweb.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index 73a37a6993..91a713be56 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -35,6 +35,7 @@ #include "llagent.h" #include "llappviewer.h" #include "llfloatermediabrowser.h" +#include "llfloaterwebcontent.h" #include "llfloaterreg.h" #include "lllogininstance.h" #include "llparcel.h" @@ -102,6 +103,13 @@ void LLWeb::loadURLInternal(const std::string &url, const std::string& target, c LLFloaterMediaBrowser::create(url, target, uuid); } +// static +// Explicitly open a Web URL using the Web content floater +void LLWeb::loadWebURLInternal(const std::string &url, const std::string& target, const std::string& uuid) +{ + LLFloaterWebContent::create(url, target, uuid); +} + // static void LLWeb::loadURLExternal(const std::string& url, const std::string& uuid) |