summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-08-12 14:53:25 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-08-12 14:53:25 -0700
commit10ec0049125317d5c0bdd1bf89b96a54a9b2d873 (patch)
tree97efa1a6731aef7e703e1a6ca2eaa4a01dbb6fa8 /indra/newview/llweb.cpp
parente69efc8369a65008d41155717761fbaec0e309c5 (diff)
parent25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff)
merge from viewer-experience
Diffstat (limited to 'indra/newview/llweb.cpp')
-rw-r--r--indra/newview/llweb.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index e4cdfaaaaf..6f7115ff6d 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -125,7 +125,7 @@ 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(LLUUID(uuid)));
+ LLFloaterWebContent::create(LLFloaterWebContent::Params().url(url).target(target).id(uuid));
}
// static