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

1 files changed, 12 insertions, 7 deletions

diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h
index ba4dc4c0fa..2c59fa6d5d 100644
--- a/indra/newview/llfloatersearch.h
+++ b/indra/newview/llfloatersearch.h
@@ -28,7 +28,7 @@
 #ifndef LL_LLFLOATERSEARCH_H
 #define LL_LLFLOATERSEARCH_H
 
-#include "llfloater.h"
+#include "llfloaterwebcontent.h"
 #include "llviewermediaobserver.h"
 
 #include <string>
@@ -43,10 +43,19 @@ class LLMediaCtrl;
 /// so that the user can click on teleport links in search results.
 ///
 class LLFloaterSearch : 
-	public LLFloater, 
-	public LLViewerMediaObserver
+	public LLFloaterWebContent
 {
 public:
+	struct _Params : public LLInitParam::Block<_Params, LLFloaterWebContent::_Params>
+	{
+		Optional<std::string> category;
+		Optional<std::string> query;
+
+		_Params();
+	};
+
+	typedef LLSDParamAdapter<_Params> Params;
+
 	LLFloaterSearch(const LLSD& key);
 
 	/// show the search floater with a new search
@@ -70,10 +79,6 @@ public:
 private:
 	/*virtual*/ BOOL postBuild();
 
-	// inherited from LLViewerMediaObserver
-	/*virtual*/ void handleMediaEvent(LLPluginClassMedia *self, EMediaEvent event);
-
-	LLMediaCtrl *mBrowser;
 	LLSD        mCategoryPaths;
 	U8          mSearchGodLevel;
 };