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

diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h
index 117ae797c5..4278ffb12f 100644
--- a/indra/llwindow/llkeyboard.h
+++ b/indra/llwindow/llkeyboard.h
@@ -1,144 +1,144 @@
-/** 
- * @file llkeyboard.h
- * @brief Handler for assignable key bindings
- *
- * $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_LLKEYBOARD_H
-#define LL_LLKEYBOARD_H
-
-#include <map>
-#include <boost/function.hpp>
-
-#include "llstringtable.h"
-#include "lltimer.h"
-#include "indra_constants.h"
-
-enum EKeystate 
-{
-	KEYSTATE_DOWN,
-	KEYSTATE_LEVEL,
-	KEYSTATE_UP
-};
-
-typedef boost::function<bool(EKeystate keystate)> LLKeyFunc;
-typedef std::string (LLKeyStringTranslatorFunc)(const char *label);
-	
-enum EKeyboardInsertMode
-{
-	LL_KIM_INSERT,
-	LL_KIM_OVERWRITE
-};
-
-class LLWindowCallbacks;
-
-class LLKeyboard
-{
-public:
-	LLKeyboard();
-	virtual ~LLKeyboard();
-
-    void			resetKeyDownAndHandle();
-    void			resetKeys();
-
-
-	F32				getCurKeyElapsedTime()	{ return getKeyDown(mCurScanKey) ? getKeyElapsedTime( mCurScanKey ) : 0.f; }
-	F32				getCurKeyElapsedFrameCount()	{ return getKeyDown(mCurScanKey) ? (F32)getKeyElapsedFrameCount( mCurScanKey ) : 0.f; }
-	bool			getKeyDown(const KEY key) { return mKeyLevel[key]; }
-	bool			getKeyRepeated(const KEY key) { return mKeyRepeated[key]; }
-
-	bool			translateKey(const U16 os_key, KEY *translated_key);
-	U16				inverseTranslateKey(const KEY translated_key);
-	bool			handleTranslatedKeyUp(KEY translated_key, U32 translated_mask);		// Translated into "Linden" keycodes
-	bool			handleTranslatedKeyDown(KEY translated_key, U32 translated_mask);	// Translated into "Linden" keycodes
-
-
-	virtual bool	handleKeyUp(const U16 key, MASK mask) = 0;
-	virtual bool	handleKeyDown(const U16 key, MASK mask) = 0;
-	
-#ifdef LL_DARWIN
-	// We only actually use this for macOS.
-	virtual void	handleModifier(MASK mask) = 0;
-#endif // LL_DARWIN
-
-	// Asynchronously poll the control, alt, and shift keys and set the
-	// appropriate internal key masks.
-	virtual void	resetMaskKeys() = 0;
-	virtual void	scanKeyboard() = 0;															// scans keyboard, calls functions as necessary
-	// Mac must differentiate between Command = Control for keyboard events
-	// and Command != Control for mouse events.
-	virtual MASK	currentMask(bool for_mouse_event) = 0;
-	virtual KEY		currentKey() { return mCurTranslatedKey; }
-
-	EKeyboardInsertMode getInsertMode()	{ return mInsertMode; }
-	void toggleInsertMode();
-
-	static bool		maskFromString(const std::string& str, MASK *mask);		// False on failure
-	static bool		keyFromString(const std::string& str, KEY *key);			// False on failure
-	static std::string stringFromKey(KEY key, bool translate = true);
-    static std::string stringFromMouse(EMouseClickType click, bool translate = true);
-	static std::string stringFromAccelerator( MASK accel_mask ); // separated for convinience, returns with "+": "Shift+" or "Shift+Alt+"...
-	static std::string stringFromAccelerator( MASK accel_mask, KEY key );
-    static std::string stringFromAccelerator(MASK accel_mask, EMouseClickType click);
-
-	void setCallbacks(LLWindowCallbacks *cbs) { mCallbacks = cbs; }
-	F32				getKeyElapsedTime( KEY key );  // Returns time in seconds since key was pressed.
-	S32				getKeyElapsedFrameCount( KEY key );  // Returns time in frames since key was pressed.
-
-	static void		setStringTranslatorFunc( LLKeyStringTranslatorFunc *trans_func );
-	
-protected:
-	void 			addKeyName(KEY key, const std::string& name);
-
-protected:
-	std::map<U16, KEY>	mTranslateKeyMap;		// Map of translations from OS keys to Linden KEYs
-	std::map<KEY, U16>	mInvTranslateKeyMap;	// Map of translations from Linden KEYs to OS keys
-	LLWindowCallbacks *mCallbacks;
-
-	LLTimer			mKeyLevelTimer[KEY_COUNT];	// Time since level was set
-	S32				mKeyLevelFrameCount[KEY_COUNT];	// Frames since level was set
-	bool			mKeyLevel[KEY_COUNT];		// Levels
-	bool			mKeyRepeated[KEY_COUNT];	// Key was repeated
-	bool			mKeyUp[KEY_COUNT];			// Up edge
-	bool			mKeyDown[KEY_COUNT];		// Down edge
-	KEY				mCurTranslatedKey;
-	KEY				mCurScanKey;		// Used during the scanKeyboard()
-
-	static LLKeyStringTranslatorFunc*	mStringTranslator;	// Used for l10n + PC/Mac/Linux accelerator labeling
-	
-	EKeyboardInsertMode mInsertMode;
-
-	static std::map<KEY,std::string> sKeysToNames;
-	static std::map<std::string,KEY> sNamesToKeys;
-};
-
-// Interface to get key from assigned command
-class LLKeyBindingToStringHandler
-{
-public:
-    virtual std::string getKeyBindingAsString(const std::string& mode, const std::string& control) const = 0;
-};
-
-extern LLKeyboard *gKeyboard;
-
-#endif
+/**

+ * @file llkeyboard.h

+ * @brief Handler for assignable key bindings

+ *

+ * $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_LLKEYBOARD_H

+#define LL_LLKEYBOARD_H

+

+#include <map>

+#include <boost/function.hpp>

+

+#include "llstringtable.h"

+#include "lltimer.h"

+#include "indra_constants.h"

+

+enum EKeystate

+{

+    KEYSTATE_DOWN,

+    KEYSTATE_LEVEL,

+    KEYSTATE_UP

+};

+

+typedef boost::function<bool(EKeystate keystate)> LLKeyFunc;

+typedef std::string (LLKeyStringTranslatorFunc)(const char *label);

+

+enum EKeyboardInsertMode

+{

+    LL_KIM_INSERT,

+    LL_KIM_OVERWRITE

+};

+

+class LLWindowCallbacks;

+

+class LLKeyboard

+{

+public:

+    LLKeyboard();

+    virtual ~LLKeyboard();

+

+    void            resetKeyDownAndHandle();

+    void            resetKeys();

+

+

+    F32             getCurKeyElapsedTime()  { return getKeyDown(mCurScanKey) ? getKeyElapsedTime( mCurScanKey ) : 0.f; }

+    F32             getCurKeyElapsedFrameCount()    { return getKeyDown(mCurScanKey) ? (F32)getKeyElapsedFrameCount( mCurScanKey ) : 0.f; }

+    bool            getKeyDown(const KEY key) { return mKeyLevel[key]; }

+    bool            getKeyRepeated(const KEY key) { return mKeyRepeated[key]; }

+

+    bool            translateKey(const U16 os_key, KEY *translated_key);

+    U16             inverseTranslateKey(const KEY translated_key);

+    bool            handleTranslatedKeyUp(KEY translated_key, U32 translated_mask);     // Translated into "Linden" keycodes

+    bool            handleTranslatedKeyDown(KEY translated_key, U32 translated_mask);   // Translated into "Linden" keycodes

+

+

+    virtual bool    handleKeyUp(const U16 key, MASK mask) = 0;

+    virtual bool    handleKeyDown(const U16 key, MASK mask) = 0;

+

+#ifdef LL_DARWIN

+    // We only actually use this for macOS.

+    virtual void    handleModifier(MASK mask) = 0;

+#endif // LL_DARWIN

+

+    // Asynchronously poll the control, alt, and shift keys and set the

+    // appropriate internal key masks.

+    virtual void    resetMaskKeys() = 0;

+    virtual void    scanKeyboard() = 0;                                                         // scans keyboard, calls functions as necessary

+    // Mac must differentiate between Command = Control for keyboard events

+    // and Command != Control for mouse events.

+    virtual MASK    currentMask(bool for_mouse_event) = 0;

+    virtual KEY     currentKey() { return mCurTranslatedKey; }

+

+    EKeyboardInsertMode getInsertMode() { return mInsertMode; }

+    void toggleInsertMode();

+

+    static bool     maskFromString(const std::string& str, MASK *mask);     // False on failure

+    static bool     keyFromString(const std::string& str, KEY *key);            // False on failure

+    static std::string stringFromKey(KEY key, bool translate = true);

+    static std::string stringFromMouse(EMouseClickType click, bool translate = true);

+    static std::string stringFromAccelerator( MASK accel_mask ); // separated for convinience, returns with "+": "Shift+" or "Shift+Alt+"...

+    static std::string stringFromAccelerator( MASK accel_mask, KEY key );

+    static std::string stringFromAccelerator(MASK accel_mask, EMouseClickType click);

+

+    void setCallbacks(LLWindowCallbacks *cbs) { mCallbacks = cbs; }

+    F32             getKeyElapsedTime( KEY key );  // Returns time in seconds since key was pressed.

+    S32             getKeyElapsedFrameCount( KEY key );  // Returns time in frames since key was pressed.

+

+    static void     setStringTranslatorFunc( LLKeyStringTranslatorFunc *trans_func );

+

+protected:

+    void            addKeyName(KEY key, const std::string& name);

+

+protected:

+    std::map<U16, KEY>  mTranslateKeyMap;       // Map of translations from OS keys to Linden KEYs

+    std::map<KEY, U16>  mInvTranslateKeyMap;    // Map of translations from Linden KEYs to OS keys

+    LLWindowCallbacks *mCallbacks;

+

+    LLTimer         mKeyLevelTimer[KEY_COUNT];  // Time since level was set

+    S32             mKeyLevelFrameCount[KEY_COUNT]; // Frames since level was set

+    bool            mKeyLevel[KEY_COUNT];       // Levels

+    bool            mKeyRepeated[KEY_COUNT];    // Key was repeated

+    bool            mKeyUp[KEY_COUNT];          // Up edge

+    bool            mKeyDown[KEY_COUNT];        // Down edge

+    KEY             mCurTranslatedKey;

+    KEY             mCurScanKey;        // Used during the scanKeyboard()

+

+    static LLKeyStringTranslatorFunc*   mStringTranslator;  // Used for l10n + PC/Mac/Linux accelerator labeling

+

+    EKeyboardInsertMode mInsertMode;

+

+    static std::map<KEY,std::string> sKeysToNames;

+    static std::map<std::string,KEY> sNamesToKeys;

+};

+

+// Interface to get key from assigned command

+class LLKeyBindingToStringHandler

+{

+public:

+    virtual std::string getKeyBindingAsString(const std::string& mode, const std::string& control) const = 0;

+};

+

+extern LLKeyboard *gKeyboard;

+

+#endif