diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-11 09:10:33 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-11 09:10:33 -0700 |
| commit | 05b31ff3b235bdcf7e9bb0fe1ff701c006e8ec66 (patch) | |
| tree | 4fd5e083694142609bd099cf71e092f9c7457e9f /indra/newview/llweb.cpp | |
| parent | 0620e6a79149e455744131703e8bdb74864b69be (diff) | |
| parent | c845925eebb5cad3049ee0f3b1d0adea3e3a46b5 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llweb.cpp')
| -rw-r--r-- | indra/newview/llweb.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index 6f7115ff6d..7bc5453688 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -125,7 +125,9 @@ void LLWeb::loadURLInternal(const std::string &url, const std::string& target, c // 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(LLFloaterWebContent::Params().url(url).target(target).id(uuid)); + LLFloaterWebContent::Params p; + p.url(url).target(target).id(uuid); + LLFloaterReg::showInstance("web_content", p); } // static |