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, 104 insertions, 104 deletions

diff --git a/indra/newview/llsearchcombobox.h b/indra/newview/llsearchcombobox.h
index ea00ab3e3e..89362ccc7b 100644
--- a/indra/newview/llsearchcombobox.h
+++ b/indra/newview/llsearchcombobox.h
@@ -1,104 +1,104 @@
-/** 
- * @file llsearchcombobox.h
- * @brief LLSearchComboBox class 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$
- */
-
-#ifndef LL_LLSEARCHCOMBOBOX_H
-#define LL_LLSEARCHCOMBOBOX_H
-
-#include "llcombobox.h"
-#include "llsearchhistory.h"
-
-/**
- * Search control with text box for search queries and a drop down list
- * with recent queries. Supports text auto-complete and filtering of drop down list
- * according to typed text.
- */
-class LLSearchComboBox : public LLComboBox
-{
-public:
-
-	struct Params :	public LLInitParam::Block<Params, LLComboBox::Params>
-	{
-		Optional<LLButton::Params> search_button;
-		Optional<bool> dropdown_button_visible;
-
-		Params();
-	};
-
-	/**
-	 * Removes an entry from combo box, case insensitive
-	 */
-	bool remove(const std::string& name);
-
-	/**
-	 * Clears search history
-	 */
-	void clearHistory();
-
-	/*virtual*/ bool handleKeyHere(KEY key, MASK mask);
-
-	~LLSearchComboBox();
-
-protected:
-
-	LLSearchComboBox(const Params&p);
-	friend class LLUICtrlFactory;
-
-	/**
-	 * Handles typing in text box
-	 */
-	void onTextEntry(LLLineEditor* line_editor);
-
-	/**
-	 * Hides drop down list and focuses text box
-	 */
-	void hideList();
-
-	/**
-	 * Rebuilds search history, case insensitive
-	 * If filter is an empty string - whole history will be added to combo box
-	 * if filter is valid string - only matching entries will be added
-	 */
-	virtual void rebuildSearchHistory(const std::string& filter);
-
-	/**
-	 * Callback for prearrange event
-	 */
-	void onSearchPrearrange(const LLSD& data);
-
-	/**
-	 * Callback for text box or combo box commit
-	 */
-	void onSelectionCommit();
-
-	/**
-	 * Sets focus to text box
-	 */
-	void focusTextEntry();
-
-	LLButton* mSearchButton;
-};
-
-#endif //LL_LLSEARCHCOMBOBOX_H
+/**

+ * @file llsearchcombobox.h

+ * @brief LLSearchComboBox class 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$

+ */

+

+#ifndef LL_LLSEARCHCOMBOBOX_H

+#define LL_LLSEARCHCOMBOBOX_H

+

+#include "llcombobox.h"

+#include "llsearchhistory.h"

+

+/**

+ * Search control with text box for search queries and a drop down list

+ * with recent queries. Supports text auto-complete and filtering of drop down list

+ * according to typed text.

+ */

+class LLSearchComboBox : public LLComboBox

+{

+public:

+

+    struct Params : public LLInitParam::Block<Params, LLComboBox::Params>

+    {

+        Optional<LLButton::Params> search_button;

+        Optional<bool> dropdown_button_visible;

+

+        Params();

+    };

+

+    /**

+     * Removes an entry from combo box, case insensitive

+     */

+    bool remove(const std::string& name);

+

+    /**

+     * Clears search history

+     */

+    void clearHistory();

+

+    /*virtual*/ bool handleKeyHere(KEY key, MASK mask);

+

+    ~LLSearchComboBox();

+

+protected:

+

+    LLSearchComboBox(const Params&p);

+    friend class LLUICtrlFactory;

+

+    /**

+     * Handles typing in text box

+     */

+    void onTextEntry(LLLineEditor* line_editor);

+

+    /**

+     * Hides drop down list and focuses text box

+     */

+    void hideList();

+

+    /**

+     * Rebuilds search history, case insensitive

+     * If filter is an empty string - whole history will be added to combo box

+     * if filter is valid string - only matching entries will be added

+     */

+    virtual void rebuildSearchHistory(const std::string& filter);

+

+    /**

+     * Callback for prearrange event

+     */

+    void onSearchPrearrange(const LLSD& data);

+

+    /**

+     * Callback for text box or combo box commit

+     */

+    void onSelectionCommit();

+

+    /**

+     * Sets focus to text box

+     */

+    void focusTextEntry();

+

+    LLButton* mSearchButton;

+};

+

+#endif //LL_LLSEARCHCOMBOBOX_H