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

diff --git a/indra/newview/lltoolmgr.h b/indra/newview/lltoolmgr.h
index 1bcc8c50e2..35edc2377f 100644
--- a/indra/newview/lltoolmgr.h
+++ b/indra/newview/lltoolmgr.h
@@ -1,131 +1,131 @@
-/** 
- * @file lltoolmgr.h
- * @brief LLToolMgr class header file
- *
- * $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_TOOLMGR_H
-#define LL_TOOLMGR_H
-
-#include "llkeyboard.h"
-
-class LLTool;
-class LLToolset;
-
-// Key bindings for common operations
-const MASK MASK_VERTICAL		= MASK_CONTROL;
-const MASK MASK_SPIN			= MASK_CONTROL | MASK_SHIFT;
-const MASK MASK_ZOOM			= MASK_NONE;
-const MASK MASK_ORBIT			= MASK_CONTROL;
-const MASK MASK_PAN				= MASK_CONTROL | MASK_SHIFT;
-const MASK MASK_COPY			= MASK_SHIFT;
-
-class LLToolMgr : public LLSingleton<LLToolMgr>
-{
-	LLSINGLETON(LLToolMgr);
-	~LLToolMgr();
-public:
-
-	// Must be called after gSavedSettings set up.
-	void			initTools();
-
-	LLTool*			getCurrentTool(); // returns active tool, taking into account keyboard state
-	LLTool*			getBaseTool(); // returns active tool when overrides are deactivated
-
-	bool			inEdit();
-	bool			canEdit();
-	bool 			buildEnabledOrActive();
-    bool            canAccessMarketplace();
-	void			toggleBuildMode(const LLSD& sdname);
-	void			toggleMarketplace(const LLSD& sdname);
-	
-	/* Determines if we are in Build mode or not. */
-	bool			inBuildMode();
-
-	void			setTransientTool(LLTool* tool);
-	void			clearTransientTool();
-	bool			usingTransientTool();
-
-	void			setCurrentToolset(LLToolset* current);
-	LLToolset*		getCurrentToolset();
-
-	void			onAppFocusGained();
-	void			onAppFocusLost();
-
-	void            clearSavedTool();
-
-protected:
-	friend class LLToolset;  // to allow access to setCurrentTool();
-	void			setCurrentTool(LLTool* tool);
-	void			updateToolStatus();
-
-protected:
-	LLTool*			mBaseTool;
-	LLTool*			mSavedTool;		// The current tool at the time application focus was lost.
-	LLTool*			mTransientTool;
-	LLTool*			mOverrideTool; // Tool triggered by keyboard override
-	LLTool*			mSelectedTool; // last known active tool
-	LLToolset*		mCurrentToolset;
-};
-
-// Sets of tools for various modes
-class LLToolset
-{
-public:
-	LLToolset() : mSelectedTool(NULL), mIsShowFloaterTools(true) {}
-
-	LLTool*			getSelectedTool()				{ return mSelectedTool; }
-
-	void			addTool(LLTool* tool);
-
-	void			selectTool( LLTool* tool );
-	void			selectToolByIndex( S32 index );
-	void			selectFirstTool();
-	void			selectNextTool();
-	void			selectPrevTool();
-
-	void			handleScrollWheel(S32 clicks);
-
-	bool			isToolSelected( S32 index );
-
-	void            setShowFloaterTools(bool pShowFloaterTools) {mIsShowFloaterTools = pShowFloaterTools;};
-	bool            isShowFloaterTools() const                  {return mIsShowFloaterTools;};
-
-protected:
-	LLTool*			mSelectedTool;
-	typedef std::vector<LLTool*> tool_list_t;
-	tool_list_t 	mToolList;
-	bool            mIsShowFloaterTools;
-};
-
-// Globals
-
-extern LLToolset* gBasicToolset;
-extern LLToolset *gCameraToolset;
-//extern LLToolset *gLandToolset;
-extern LLToolset* gMouselookToolset;
-extern LLToolset* gFaceEditToolset;
-
-extern LLTool*		gToolNull;
-
-#endif
+/**

+ * @file lltoolmgr.h

+ * @brief LLToolMgr class header file

+ *

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

+#define LL_TOOLMGR_H

+

+#include "llkeyboard.h"

+

+class LLTool;

+class LLToolset;

+

+// Key bindings for common operations

+const MASK MASK_VERTICAL        = MASK_CONTROL;

+const MASK MASK_SPIN            = MASK_CONTROL | MASK_SHIFT;

+const MASK MASK_ZOOM            = MASK_NONE;

+const MASK MASK_ORBIT           = MASK_CONTROL;

+const MASK MASK_PAN             = MASK_CONTROL | MASK_SHIFT;

+const MASK MASK_COPY            = MASK_SHIFT;

+

+class LLToolMgr : public LLSingleton<LLToolMgr>

+{

+    LLSINGLETON(LLToolMgr);

+    ~LLToolMgr();

+public:

+

+    // Must be called after gSavedSettings set up.

+    void            initTools();

+

+    LLTool*         getCurrentTool(); // returns active tool, taking into account keyboard state

+    LLTool*         getBaseTool(); // returns active tool when overrides are deactivated

+

+    bool            inEdit();

+    bool            canEdit();

+    bool            buildEnabledOrActive();

+    bool            canAccessMarketplace();

+    void            toggleBuildMode(const LLSD& sdname);

+    void            toggleMarketplace(const LLSD& sdname);

+

+    /* Determines if we are in Build mode or not. */

+    bool            inBuildMode();

+

+    void            setTransientTool(LLTool* tool);

+    void            clearTransientTool();

+    bool            usingTransientTool();

+

+    void            setCurrentToolset(LLToolset* current);

+    LLToolset*      getCurrentToolset();

+

+    void            onAppFocusGained();

+    void            onAppFocusLost();

+

+    void            clearSavedTool();

+

+protected:

+    friend class LLToolset;  // to allow access to setCurrentTool();

+    void            setCurrentTool(LLTool* tool);

+    void            updateToolStatus();

+

+protected:

+    LLTool*         mBaseTool;

+    LLTool*         mSavedTool;     // The current tool at the time application focus was lost.

+    LLTool*         mTransientTool;

+    LLTool*         mOverrideTool; // Tool triggered by keyboard override

+    LLTool*         mSelectedTool; // last known active tool

+    LLToolset*      mCurrentToolset;

+};

+

+// Sets of tools for various modes

+class LLToolset

+{

+public:

+    LLToolset() : mSelectedTool(NULL), mIsShowFloaterTools(true) {}

+

+    LLTool*         getSelectedTool()               { return mSelectedTool; }

+

+    void            addTool(LLTool* tool);

+

+    void            selectTool( LLTool* tool );

+    void            selectToolByIndex( S32 index );

+    void            selectFirstTool();

+    void            selectNextTool();

+    void            selectPrevTool();

+

+    void            handleScrollWheel(S32 clicks);

+

+    bool            isToolSelected( S32 index );

+

+    void            setShowFloaterTools(bool pShowFloaterTools) {mIsShowFloaterTools = pShowFloaterTools;};

+    bool            isShowFloaterTools() const                  {return mIsShowFloaterTools;};

+

+protected:

+    LLTool*         mSelectedTool;

+    typedef std::vector<LLTool*> tool_list_t;

+    tool_list_t     mToolList;

+    bool            mIsShowFloaterTools;

+};

+

+// Globals

+

+extern LLToolset* gBasicToolset;

+extern LLToolset *gCameraToolset;

+//extern LLToolset *gLandToolset;

+extern LLToolset* gMouselookToolset;

+extern LLToolset* gFaceEditToolset;

+

+extern LLTool*      gToolNull;

+

+#endif