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

diff --git a/indra/llui/llsearcheditor.h b/indra/llui/llsearcheditor.h
index 3f8c6323b0..7c6e5dc554 100644
--- a/indra/llui/llsearcheditor.h
+++ b/indra/llui/llsearcheditor.h
@@ -1,114 +1,114 @@
-/** 
- * @file llsearcheditor.h
- * @brief Text editor widget that represents a search operation
- *
- * Features: 
- *		Text entry of a single line (text, delete, left and right arrow, insert, return).
- *		Callbacks either on every keystroke or just on the return key.
- *		Focus (allow multiple text entry widgets)
- *		Clipboard (cut, copy, and paste)
- *		Horizontal scrolling to allow strings longer than widget size allows 
- *		Pre-validation (limit which keys can be used)
- *		Optional line history so previous entries can be recalled by CTRL UP/DOWN
- *
- * $LicenseInfo:firstyear=2001&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_SEARCHEDITOR_H
-#define LL_SEARCHEDITOR_H
-
-#include "lllineeditor.h"
-#include "llbutton.h"
-
-class LLSearchEditor : public LLUICtrl
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLLineEditor::Params>
-	{
-		Optional<LLButton::Params>	search_button, 
-									clear_button;
-		Optional<bool>				search_button_visible, 
-									clear_button_visible,
-									highlight_text_field;
-		Optional<commit_callback_t> keystroke_callback;
-
-		Optional<LLUIImage*>		background_image,
-									background_image_focused,
-									background_image_highlight;
-
-		Params()
-		:	search_button("search_button"),
-			search_button_visible("search_button_visible"),
-			clear_button("clear_button"), 
-			clear_button_visible("clear_button_visible"),
-			highlight_text_field("highlight_text_field"),
-			background_image("background_image"),
-			background_image_focused("background_image_focused"),
-			background_image_highlight("background_image_highlight")
-		{}
-	};
-
-	void setCommitOnFocusLost(bool b)	{ if (mSearchEditor) mSearchEditor->setCommitOnFocusLost(b); }
-
-protected:
-	LLSearchEditor(const Params&);
-	friend class LLUICtrlFactory;
-
-public:
-	virtual ~LLSearchEditor();
-
-	/*virtual*/ void	draw();
-
-	void setText(const LLStringExplicit &new_text) { mSearchEditor->setText(new_text); }
-	const std::string& getText() const		{ return mSearchEditor->getText(); }
-
-	// LLUICtrl interface
-	virtual void	setValue(const LLSD& value );
-	virtual LLSD	getValue() const;
-	virtual bool	setTextArg( const std::string& key, const LLStringExplicit& text );
-	virtual bool	setLabelArg( const std::string& key, const LLStringExplicit& text );
-	virtual void	setLabel( const LLStringExplicit &new_label );
-	virtual void	clear();
-	virtual void	setFocus( bool b );
-
-	void			setKeystrokeCallback( commit_callback_t cb ) { mKeystrokeCallback = cb; }
-	void			setTextChangedCallback( commit_callback_t cb ) { mTextChangedCallback = cb; }
-
-protected:
-	void onClearButtonClick(const LLSD& data);
-	virtual void handleKeystroke();
-
-	commit_callback_t mKeystrokeCallback;
-	commit_callback_t mTextChangedCallback;
-	LLLineEditor* mSearchEditor;
-	LLButton* mSearchButton;
-	LLButton* mClearButton;
-
-	LLPointer<LLUIImage> mEditorImage;
-	LLPointer<LLUIImage> mEditorImageFocused;
-	LLPointer<LLUIImage> mEditorSearchImage;
-	LLPointer<LLUIImage> mEditorSearchImageFocused;
-
-	bool mHighlightTextField;
-};
-
-#endif  // LL_SEARCHEDITOR_H
+/**

+ * @file llsearcheditor.h

+ * @brief Text editor widget that represents a search operation

+ *

+ * Features:

+ *      Text entry of a single line (text, delete, left and right arrow, insert, return).

+ *      Callbacks either on every keystroke or just on the return key.

+ *      Focus (allow multiple text entry widgets)

+ *      Clipboard (cut, copy, and paste)

+ *      Horizontal scrolling to allow strings longer than widget size allows

+ *      Pre-validation (limit which keys can be used)

+ *      Optional line history so previous entries can be recalled by CTRL UP/DOWN

+ *

+ * $LicenseInfo:firstyear=2001&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_SEARCHEDITOR_H

+#define LL_SEARCHEDITOR_H

+

+#include "lllineeditor.h"

+#include "llbutton.h"

+

+class LLSearchEditor : public LLUICtrl

+{

+public:

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

+    {

+        Optional<LLButton::Params>  search_button,

+                                    clear_button;

+        Optional<bool>              search_button_visible,

+                                    clear_button_visible,

+                                    highlight_text_field;

+        Optional<commit_callback_t> keystroke_callback;

+

+        Optional<LLUIImage*>        background_image,

+                                    background_image_focused,

+                                    background_image_highlight;

+

+        Params()

+        :   search_button("search_button"),

+            search_button_visible("search_button_visible"),

+            clear_button("clear_button"),

+            clear_button_visible("clear_button_visible"),

+            highlight_text_field("highlight_text_field"),

+            background_image("background_image"),

+            background_image_focused("background_image_focused"),

+            background_image_highlight("background_image_highlight")

+        {}

+    };

+

+    void setCommitOnFocusLost(bool b)   { if (mSearchEditor) mSearchEditor->setCommitOnFocusLost(b); }

+

+protected:

+    LLSearchEditor(const Params&);

+    friend class LLUICtrlFactory;

+

+public:

+    virtual ~LLSearchEditor();

+

+    /*virtual*/ void    draw();

+

+    void setText(const LLStringExplicit &new_text) { mSearchEditor->setText(new_text); }

+    const std::string& getText() const      { return mSearchEditor->getText(); }

+

+    // LLUICtrl interface

+    virtual void    setValue(const LLSD& value );

+    virtual LLSD    getValue() const;

+    virtual bool    setTextArg( const std::string& key, const LLStringExplicit& text );

+    virtual bool    setLabelArg( const std::string& key, const LLStringExplicit& text );

+    virtual void    setLabel( const LLStringExplicit &new_label );

+    virtual void    clear();

+    virtual void    setFocus( bool b );

+

+    void            setKeystrokeCallback( commit_callback_t cb ) { mKeystrokeCallback = cb; }

+    void            setTextChangedCallback( commit_callback_t cb ) { mTextChangedCallback = cb; }

+

+protected:

+    void onClearButtonClick(const LLSD& data);

+    virtual void handleKeystroke();

+

+    commit_callback_t mKeystrokeCallback;

+    commit_callback_t mTextChangedCallback;

+    LLLineEditor* mSearchEditor;

+    LLButton* mSearchButton;

+    LLButton* mClearButton;

+

+    LLPointer<LLUIImage> mEditorImage;

+    LLPointer<LLUIImage> mEditorImageFocused;

+    LLPointer<LLUIImage> mEditorSearchImage;

+    LLPointer<LLUIImage> mEditorSearchImageFocused;

+

+    bool mHighlightTextField;

+};

+

+#endif  // LL_SEARCHEDITOR_H