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

diff --git a/indra/llui/llchatentry.h b/indra/llui/llchatentry.h
index 06d9d462b4..5fc336c8cc 100644
--- a/indra/llui/llchatentry.h
+++ b/indra/llui/llchatentry.h
@@ -1,106 +1,106 @@
-/**
- * @file llchatentry.h
- * @author Paul Guslisty
- * @brief Text editor widget which is used for user input
- *
- * Features:
- *			Optional line history so previous entries can be recalled by CTRL UP/DOWN
- *			Optional auto-resize behavior on input chat field
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2012, 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 LLCHATENTRY_H_
-#define LLCHATENTRY_H_
-
-#include "lltexteditor.h"
-
-class LLChatEntry : public LLTextEditor
-{
-public:
-
-	struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>
-	{
-		Optional<bool>		has_history,
-							is_expandable;
-
-		Optional<int>		expand_lines_count;
-
-		Params();
-	};
-
-	virtual ~LLChatEntry();
-
-protected:
-
-	friend class LLUICtrlFactory;
-	LLChatEntry(const Params& p);
-    /*virtual*/ void    beforeValueChange();
-    /*virtual*/ void    onValueChange(S32 start, S32 end);
-    /*virtual*/ bool    useLabel() const;
-
-public:
-
-	virtual void	draw();
-	virtual	void	onCommit();
-    /*virtual*/ void	onFocusReceived();
-    /*virtual*/ void	onFocusLost();
-
-	void enableSingleLineMode(bool single_line_mode);
-	boost::signals2::connection setTextExpandedCallback(const commit_signal_t::slot_type& cb);
-
-private:
-
-	/**
-	 * Implements auto-resize behavior.
-	 * When user's typing reaches the right edge of the chat field
-	 * the chat field expands vertically by one line. The bottom of
-	 * the chat field remains bottom-justified. The chat field does
-	 * not expand beyond mExpandLinesCount.
-	 */
-	void	expandText();
-
-	/**
-	 * Implements line history so previous entries can be recalled by CTRL UP/DOWN
-	 */
-	void	updateHistory();
-
-	bool	handleSpecialKey(const KEY key, const MASK mask);
-
-
-	// Fired when text height expanded to mExpandLinesCount
-	commit_signal_t*			mTextExpandedSignal;
-
-	// line history support:
-	typedef std::vector<std::string>	line_history_t;
-	line_history_t::iterator			mCurrentHistoryLine;	// currently browsed history line
-	line_history_t						mLineHistory;			// line history storage
-	bool								mHasHistory;			// flag for enabled/disabled line history
-	bool								mIsExpandable;
-	bool								mSingleLineMode;
-
-	S32									mExpandLinesCount;
-	S32									mPrevLinesCount;
-	S32									mPrevExpandedLineCount;
-};
-
-#endif /* LLCHATENTRY_H_ */
+/**

+ * @file llchatentry.h

+ * @author Paul Guslisty

+ * @brief Text editor widget which is used for user input

+ *

+ * Features:

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

+ *          Optional auto-resize behavior on input chat field

+ *

+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2012, 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 LLCHATENTRY_H_

+#define LLCHATENTRY_H_

+

+#include "lltexteditor.h"

+

+class LLChatEntry : public LLTextEditor

+{

+public:

+

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

+    {

+        Optional<bool>      has_history,

+                            is_expandable;

+

+        Optional<int>       expand_lines_count;

+

+        Params();

+    };

+

+    virtual ~LLChatEntry();

+

+protected:

+

+    friend class LLUICtrlFactory;

+    LLChatEntry(const Params& p);

+    /*virtual*/ void    beforeValueChange();

+    /*virtual*/ void    onValueChange(S32 start, S32 end);

+    /*virtual*/ bool    useLabel() const;

+

+public:

+

+    virtual void    draw();

+    virtual void    onCommit();

+    /*virtual*/ void    onFocusReceived();

+    /*virtual*/ void    onFocusLost();

+

+    void enableSingleLineMode(bool single_line_mode);

+    boost::signals2::connection setTextExpandedCallback(const commit_signal_t::slot_type& cb);

+

+private:

+

+    /**

+     * Implements auto-resize behavior.

+     * When user's typing reaches the right edge of the chat field

+     * the chat field expands vertically by one line. The bottom of

+     * the chat field remains bottom-justified. The chat field does

+     * not expand beyond mExpandLinesCount.

+     */

+    void    expandText();

+

+    /**

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

+     */

+    void    updateHistory();

+

+    bool    handleSpecialKey(const KEY key, const MASK mask);

+

+

+    // Fired when text height expanded to mExpandLinesCount

+    commit_signal_t*            mTextExpandedSignal;

+

+    // line history support:

+    typedef std::vector<std::string>    line_history_t;

+    line_history_t::iterator            mCurrentHistoryLine;    // currently browsed history line

+    line_history_t                      mLineHistory;           // line history storage

+    bool                                mHasHistory;            // flag for enabled/disabled line history

+    bool                                mIsExpandable;

+    bool                                mSingleLineMode;

+

+    S32                                 mExpandLinesCount;

+    S32                                 mPrevLinesCount;

+    S32                                 mPrevExpandedLineCount;

+};

+

+#endif /* LLCHATENTRY_H_ */