summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-10-11 15:16:45 -0700
committerMerov Linden <merov@lindenlab.com>2011-10-11 15:16:45 -0700
commit682609d254fb973cfa267923b69c5e06b7efd7e1 (patch)
tree0063e23841b6e3bb588355ad428608bb1f4fcdf9 /indra/newview/llweb.cpp
parent3596c0f7e139724f31258ffb96157146aeba77b1 (diff)
parentc1a9ca33b27f4e741eeacf781a09156009167ad3 (diff)
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llweb.cpp')
-rw-r--r--indra/newview/llweb.cpp4
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