diff options
| author | Richard Linden <none@none> | 2011-07-29 16:38:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-07-29 16:38:07 -0700 |
| commit | feddda6740f55c5e872be4b608d516e86e0c4182 (patch) | |
| tree | a766b97bc23a976feaa3387b43a189199eec1cb3 /indra/newview/llweb.cpp | |
| parent | 63a857f0c7f09c45eca9034c41ca1fdfc1ae95b5 (diff) | |
EXP-1056 FIX Web popup issues with Web Content Browser
changed browser id back to a string so it accepts malformed uuid strings
coming from webkit - "{uuid}" instead of "uuid"
Diffstat (limited to 'indra/newview/llweb.cpp')
| -rw-r--r-- | indra/newview/llweb.cpp | 2 |
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 |