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

diff --git a/indra/newview/llchatbar.h b/indra/newview/llchatbar.h
index ef1f65304c..e538f72533 100644
--- a/indra/newview/llchatbar.h
+++ b/indra/newview/llchatbar.h
@@ -1,112 +1,112 @@
-/** 
- * @file llchatbar.h
- * @brief LLChatBar class definition
- *
- * $LicenseInfo:firstyear=2002&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_LLCHATBAR_H
-#define LL_LLCHATBAR_H
-
-#include "llpanel.h"
-#include "llframetimer.h"
-#include "llchat.h"
-
-class LLLineEditor;
-class LLMessageSystem;
-class LLUICtrl;
-class LLUUID;
-class LLFrameTimer;
-class LLChatBarGestureObserver;
-class LLComboBox;
-
-
-class LLChatBar
-:	public LLPanel
-{
-public:
-	// constructor for inline chat-bars (e.g. hosted in chat history window)
-	LLChatBar();
-	~LLChatBar();
-	virtual bool postBuild();
-
-	virtual bool handleKeyHere(KEY key, MASK mask);
-
-	void		refresh();
-	void		refreshGestures();
-
-	// Move cursor into chat input field.
-	void		setKeyboardFocus(bool b);
-
-	// Ignore arrow keys for chat bar
-	void		setIgnoreArrowKeys(bool b);
-
-	bool		inputEditorHasFocus();
-	std::string	getCurrentChat();
-
-	// since chat bar logic is reused for chat history
-	// gesture combo box might not be a direct child
-	void		setGestureCombo(LLComboBox* combo);
-
-	// Send a chat (after stripping /20foo channel chats).
-	// "Animate" means the nodding animation for regular text.
-	void		sendChatFromViewer(const LLWString &wtext, EChatType type, bool animate);
-	void		sendChatFromViewer(const std::string &utf8text, EChatType type, bool animate);
-
-	// If input of the form "/20foo" or "/20 foo", returns "foo" and channel 20.
-	// Otherwise returns input and channel 0.
-	LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
-
-	// callbacks
-	void onClickSay(LLUICtrl* ctrl);
-
-	static void	onTabClick( void* userdata );
-	static void	onInputEditorKeystroke(LLLineEditor* caller, void* userdata);
-	static void	onInputEditorFocusLost();
-	static void	onInputEditorGainFocus();
-
-	void onCommitGesture(LLUICtrl* ctrl);
-
-	static void startChat(const char* line);
-	static void stopChat();
-
-protected:
-	void sendChat(EChatType type);
-	void updateChat();
-
-protected:
-	LLLineEditor*	mInputEditor;
-
-	LLFrameTimer	mGestureLabelTimer;
-
-	// Which non-zero channel did we last chat on?
-	S32				mLastSpecialChatChannel;
-
-	bool			mIsBuilt;
-	LLComboBox*		mGestureCombo;
-
-	LLChatBarGestureObserver* mObserver;
-};
-
-extern LLChatBar *gChatBar;
-
-#endif
+/**

+ * @file llchatbar.h

+ * @brief LLChatBar class definition

+ *

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

+#define LL_LLCHATBAR_H

+

+#include "llpanel.h"

+#include "llframetimer.h"

+#include "llchat.h"

+

+class LLLineEditor;

+class LLMessageSystem;

+class LLUICtrl;

+class LLUUID;

+class LLFrameTimer;

+class LLChatBarGestureObserver;

+class LLComboBox;

+

+

+class LLChatBar

+:   public LLPanel

+{

+public:

+    // constructor for inline chat-bars (e.g. hosted in chat history window)

+    LLChatBar();

+    ~LLChatBar();

+    virtual bool postBuild();

+

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

+

+    void        refresh();

+    void        refreshGestures();

+

+    // Move cursor into chat input field.

+    void        setKeyboardFocus(bool b);

+

+    // Ignore arrow keys for chat bar

+    void        setIgnoreArrowKeys(bool b);

+

+    bool        inputEditorHasFocus();

+    std::string getCurrentChat();

+

+    // since chat bar logic is reused for chat history

+    // gesture combo box might not be a direct child

+    void        setGestureCombo(LLComboBox* combo);

+

+    // Send a chat (after stripping /20foo channel chats).

+    // "Animate" means the nodding animation for regular text.

+    void        sendChatFromViewer(const LLWString &wtext, EChatType type, bool animate);

+    void        sendChatFromViewer(const std::string &utf8text, EChatType type, bool animate);

+

+    // If input of the form "/20foo" or "/20 foo", returns "foo" and channel 20.

+    // Otherwise returns input and channel 0.

+    LLWString stripChannelNumber(const LLWString &mesg, S32* channel);

+

+    // callbacks

+    void onClickSay(LLUICtrl* ctrl);

+

+    static void onTabClick( void* userdata );

+    static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata);

+    static void onInputEditorFocusLost();

+    static void onInputEditorGainFocus();

+

+    void onCommitGesture(LLUICtrl* ctrl);

+

+    static void startChat(const char* line);

+    static void stopChat();

+

+protected:

+    void sendChat(EChatType type);

+    void updateChat();

+

+protected:

+    LLLineEditor*   mInputEditor;

+

+    LLFrameTimer    mGestureLabelTimer;

+

+    // Which non-zero channel did we last chat on?

+    S32             mLastSpecialChatChannel;

+

+    bool            mIsBuilt;

+    LLComboBox*     mGestureCombo;

+

+    LLChatBarGestureObserver* mObserver;

+};

+

+extern LLChatBar *gChatBar;

+

+#endif