Merge pull request #4714 from secondlife/release/2025.07

Release/2025.07

1 files changed, 18 insertions, 64 deletions

diff --git a/indra/newview/llfloatersearch.h b/indra/newview/llfloatersearch.h
index beaac2ad2f..6d93474f4a 100644
--- a/indra/newview/llfloatersearch.h
+++ b/indra/newview/llfloatersearch.h
@@ -1,11 +1,10 @@
 /**
  * @file llfloatersearch.h
- * @author Martin Reddy
- * @brief Search floater - uses an embedded web browser control
+ * @brief Floater for Search (update 2025, preload)
  *
- * $LicenseInfo:firstyear=2009&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
  * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2011, Linden Research, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,70 +24,25 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLFLOATERSEARCH_H
-#define LL_LLFLOATERSEARCH_H
+#pragma once
 
+#include "llfloater.h"
 #include "llfloaterwebcontent.h"
-#include "llviewermediaobserver.h"
 
-#include <string>
+class LLFloaterSearch:
+        public LLFloaterWebContent {
+        friend class LLFloaterReg;
 
-class LLMediaCtrl;
+    public:
+        void onOpen(const LLSD& key) override;
+        void onClose(bool app_quitting) override;
 
-///
-/// The search floater allows users to perform all search operations.
-/// All search functionality is now implemented via web services and
-/// so this floater simply embeds a web view and displays the search
-/// web page. The browser control is explicitly marked as "trusted"
-/// so that the user can click on teleport links in search results.
-///
-class LLFloaterSearch :
-    public LLFloaterWebContent
-{
-public:
-    struct SearchQuery : public LLInitParam::Block<SearchQuery>
-    {
-        Optional<std::string> category;
-        Optional<std::string> collection;
-        Optional<std::string> query;
+    private:
+        LLFloaterSearch(const LLSD& key);
+        ~LLFloaterSearch();
+        void initiateSearch(const LLSD& tokens);
+        bool postBuild() override;
 
-        SearchQuery();
-    };
-
-    struct _Params : public LLInitParam::Block<_Params, LLFloaterWebContent::Params>
-    {
-        Optional<SearchQuery> search;
-    };
-
-    typedef LLSDParamAdapter<_Params> Params;
-
-    LLFloaterSearch(const Params& key);
-
-    /// show the search floater with a new search
-    /// see search() for details on the key parameter.
-    /*virtual*/ void onOpen(const LLSD& key);
-
-    /*virtual*/ void onClose(bool app_quitting);
-
-    /// perform a search with the specific search term.
-    /// The key should be a map that can contain the following keys:
-    ///  - "id": specifies the text phrase to search for
-    ///  - "category": one of "all" (default), "people", "places",
-    ///    "events", "groups", "wiki", "destinations", "classifieds"
-    void search(const SearchQuery &query);
-
-    /// changing godmode can affect the search results that are
-    /// returned by the search website - use this method to tell the
-    /// search floater that the user has changed god level.
-    void godLevelChanged(U8 godlevel);
-
-private:
-    /*virtual*/ bool postBuild();
-
-    std::set<std::string> mSearchType;
-    std::set<std::string> mCollectionType;
-    U8          mSearchGodLevel;
+        std::set<std::string> mSearchType;
+        std::set<std::string> mCollectionType;
 };
-
-#endif  // LL_LLFLOATERSEARCH_H
-