diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:18:44 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:18:44 -0700 |
| commit | bf7d3532c6c139f87922afbc35d8ffa579f83cca (patch) | |
| tree | 321eb01c0af0c612676846c1f3b22110ed688ee9 /indra/newview/llweb.cpp | |
| parent | 71879916428e9e15081d73696f46bb4a32877265 (diff) | |
| parent | ec23ec68ea8835e4155e083ec5570245b0aef1ec (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
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 |