From fecf706f1be58f76df81f8bc1a4a5f3307cee6ff Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 20 Jul 2011 20:16:47 -0700 Subject: EXP-880 FIX Enable navigation chrome for Search floater changes in size of target windows other than _blank or "" are not saved EXP-1018 FIX Profile button in Basic mode does not toggle correctly when profile is opened and toggles on and closes other Web Content Panel windows --- indra/newview/llfloaterwebcontent.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterwebcontent.cpp') diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index c7c6857a47..785441a67e 100644 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -87,7 +87,15 @@ BOOL LLFloaterWebContent::postBuild() bool LLFloaterWebContent::matchesKey(const LLSD& key) { - return key["target"].asString() == mKey["target"].asString(); + LLUUID id = key["id"]; + if (id.notNull()) + { + return id == mKey["id"].asUUID(); + } + else + { + return key["target"].asString() == mKey["target"].asString(); + } } @@ -250,6 +258,10 @@ void LLFloaterWebContent::onOpen(const LLSD& key) return; } + if (params.target() == params.id().asString()) + { + setRectControl(""); + } mUUID = params.id().asString(); mWebBrowser->setTrustedContent(params.trusted_content); -- cgit v1.2.3