From fa3f4d11665af44234f8e0ae3e8d8c0ce31d356d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 12 Jul 2011 20:58:30 -0700
Subject: EXP-880 FIX Enable navigation chrome for Search floater search
 floater derives from floater_web_content all web content now uses
 floater_web_content instead of media_browser

---
 indra/llui/llfloater.h | 2 +-
 indra/llui/llsdparam.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 5b7b020881..9aae1afc62 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -253,7 +253,7 @@ public:
 
 	LLHandle<LLFloater> getHandle() const { return mHandle; }
 	const LLSD& 	getKey() { return mKey; }
-	BOOL		 	matchesKey(const LLSD& key) { return mSingleInstance || KeyCompare::equate(key, mKey); }
+	virtual bool	matchesKey(const LLSD& key) { return mSingleInstance || KeyCompare::equate(key, mKey); }
 	
 	const std::string& getInstanceName() { return mInstanceName; }
 	
diff --git a/indra/llui/llsdparam.h b/indra/llui/llsdparam.h
index 69dab2b411..827b8c8584 100644
--- a/indra/llui/llsdparam.h
+++ b/indra/llui/llsdparam.h
@@ -93,6 +93,14 @@ class LLSDParamAdapter : public T
 			LLParamSDParser parser;
 			parser.readSD(sd, *this);
 		}
+
+		operator LLSD() const
+		{
+			LLParamSDParser parser;
+			LLSD sd;
+			parser.writeSD(sd, *this);
+			return sd;
+		}
 		
 		LLSDParamAdapter(const T& val)
 		{
-- 
cgit v1.2.3