From feddda6740f55c5e872be4b608d516e86e0c4182 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 29 Jul 2011 16:38:07 -0700
Subject: 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"

---
 indra/newview/llfloaterwebcontent.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llfloaterwebcontent.h')

diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h
index 2e3c6ffd84..36e214b7a9 100644
--- a/indra/newview/llfloaterwebcontent.h
+++ b/indra/newview/llfloaterwebcontent.h
@@ -40,7 +40,7 @@ class LLIconCtrl;
 class LLFloaterWebContent :
 	public LLFloater,
 	public LLViewerMediaObserver,
-	public LLInstanceTracker<LLFloaterWebContent, LLUUID>
+	public LLInstanceTracker<LLFloaterWebContent, std::string>
 {
 public:
     LOG_CLASS(LLFloaterWebContent);
@@ -49,8 +49,8 @@ public:
 	{
 		Optional<std::string>	url,
 								target,
-								window_class;
-		Optional<LLUUID>		id;
+								window_class,
+								id;
 		Optional<bool>			show_chrome,
 								allow_address_entry,
 								trusted_content;
-- 
cgit v1.2.3