Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 76 insertions, 76 deletions

diff --git a/indra/newview/llsearchhistory.h b/indra/newview/llsearchhistory.h
index 4ae6122396..1c4ece890c 100644
--- a/indra/newview/llsearchhistory.h
+++ b/indra/newview/llsearchhistory.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llsearchhistory.h
  * @brief Search history container definition
  *
  * $LicenseInfo:firstyear=2009&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, 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
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -37,104 +37,104 @@
  */
 class LLSearchHistory : public LLSingleton<LLSearchHistory>, private LLDestroyClass<LLSearchHistory>
 {
-	LLSINGLETON(LLSearchHistory);
-	friend class LLDestroyClass<LLSearchHistory>;
+    LLSINGLETON(LLSearchHistory);
+    friend class LLDestroyClass<LLSearchHistory>;
 public:
 
-	// Forward declaration
-	class LLSearchHistoryItem;
+    // Forward declaration
+    class LLSearchHistoryItem;
 
-	// Search history container
-	typedef std::list<LLSearchHistoryItem>	search_history_list_t;
+    // Search history container
+    typedef std::list<LLSearchHistoryItem>  search_history_list_t;
 
-	/**
-	 * Saves search history to file
-	 */
-	bool save();
+    /**
+     * Saves search history to file
+     */
+    bool save();
 
-	/**
-	 * loads search history from file
-	 */
-	bool load();
+    /**
+     * loads search history from file
+     */
+    bool load();
 
-	/**
-	 * Returns search history list
-	 */
-	search_history_list_t& getSearchHistoryList() { return mSearchHistory; }
+    /**
+     * Returns search history list
+     */
+    search_history_list_t& getSearchHistoryList() { return mSearchHistory; }
 
-	/**
-	 * Deletes all search history queries from list.
-	 */
-	void clearHistory() { mSearchHistory.clear(); }
+    /**
+     * Deletes all search history queries from list.
+     */
+    void clearHistory() { mSearchHistory.clear(); }
 
-	/**
-	 * Adds unique entry to front of search history list, case insensitive
-	 * If entry is already in list, it will be deleted and added to front.
-	 */
-	void addEntry(const std::string& search_text);
+    /**
+     * Adds unique entry to front of search history list, case insensitive
+     * If entry is already in list, it will be deleted and added to front.
+     */
+    void addEntry(const std::string& search_text);
 
 
-	/**
-	 * Class for storing data about single search request.
-	 */
-	class LLSearchHistoryItem
-	{
-	public:
+    /**
+     * Class for storing data about single search request.
+     */
+    class LLSearchHistoryItem
+    {
+    public:
 
-		LLSearchHistoryItem()
-		{}
+        LLSearchHistoryItem()
+        {}
 
-		LLSearchHistoryItem(const std::string& query)
-			: search_query(query)
-		{}
+        LLSearchHistoryItem(const std::string& query)
+            : search_query(query)
+        {}
 
-		LLSearchHistoryItem(const LLSD& item)
-		{
-			if(item.has(SEARCH_QUERY))
-				search_query = item[SEARCH_QUERY].asString();
-		}
+        LLSearchHistoryItem(const LLSD& item)
+        {
+            if(item.has(SEARCH_QUERY))
+                search_query = item[SEARCH_QUERY].asString();
+        }
 
-		std::string search_query;
+        std::string search_query;
 
-		/**
-		 * Allows std::list sorting
-		 */
-		bool operator < (const LLSearchHistory::LLSearchHistoryItem& right) const;
+        /**
+         * Allows std::list sorting
+         */
+        bool operator < (const LLSearchHistory::LLSearchHistoryItem& right) const;
 
-		/**
-		 * Allows std::list sorting
-		 */
-		bool operator > (const LLSearchHistory::LLSearchHistoryItem& right) const;
+        /**
+         * Allows std::list sorting
+         */
+        bool operator > (const LLSearchHistory::LLSearchHistoryItem& right) const;
 
-		bool operator==(const LLSearchHistoryItem& right) const;
+        bool operator==(const LLSearchHistoryItem& right) const;
 
-		bool operator==(const std::string& right) const;
+        bool operator==(const std::string& right) const;
 
-		/**
-		 * Serializes search history item to LLSD
-		 */
-		LLSD toLLSD() const;
-	};
+        /**
+         * Serializes search history item to LLSD
+         */
+        LLSD toLLSD() const;
+    };
 
 protected:
 
-	/**
-	 * Returns path to search history file.
-	 */
-	std::string getHistoryFilePath();
+    /**
+     * Returns path to search history file.
+     */
+    std::string getHistoryFilePath();
 
-	static std::string SEARCH_HISTORY_FILE_NAME;
-	static std::string SEARCH_QUERY;
+    static std::string SEARCH_HISTORY_FILE_NAME;
+    static std::string SEARCH_QUERY;
 
 private:
 
-	// Implementation of LLDestroyClass<LLSearchHistory>
-	static void destroyClass()
-	{
-		LLSearchHistory::getInstance()->save();
-	}
+    // Implementation of LLDestroyClass<LLSearchHistory>
+    static void destroyClass()
+    {
+        LLSearchHistory::getInstance()->save();
+    }
 
-	search_history_list_t mSearchHistory;
+    search_history_list_t mSearchHistory;
 };
 
 class LLSearchComboBox;