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

diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index aa306c64d4..0a568c1928 100644
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -1,129 +1,129 @@
-/** 
- * @file lltoolbarview.h
- * @author Merov Linden
- * @brief User customizable toolbar class
- *
- * $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, 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_LLTOOLBARVIEW_H
-#define LL_LLTOOLBARVIEW_H
-
-#include "lluictrl.h"
-#include "lltoolbar.h"
-#include "llcommandmanager.h"
-#include "llinventory.h"
-
-class LLUICtrlFactory;
-
-// Parent of all LLToolBar
-
-class LLToolBarView : public LLUICtrl
-{
-public:
-	// Xui structure of the toolbar panel
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> {};
-
-	// Note: valid children for LLToolBarView are stored in this registry
-	typedef LLDefaultChildRegistry child_registry_t;
-	
-	// Xml structure of the toolbars.xml setting
-	// Those live in a toolbars.xml found in app_settings (for the default) and in
-	// the user folder for the user specific (saved) settings
-	struct Toolbar : public LLInitParam::Block<Toolbar>
-	{
-		Mandatory<LLToolBarEnums::ButtonType>	button_display_mode;
-		Multiple<LLCommandId::Params>	commands;
-
-		Toolbar();
-	};
-	struct ToolbarSet : public LLInitParam::Block<ToolbarSet>
-	{
-		Optional<Toolbar>	left_toolbar,
-							right_toolbar,
-							bottom_toolbar;
-
-		ToolbarSet();
-	};
-
-	// Derived methods
-	virtual ~LLToolBarView();
-	bool postBuild() override;
-	void draw() override;
-
-	// Toolbar view interface with the rest of the world
-	// Checks if the commandId is being used somewhere in one of the toolbars, returns LLToolBarEnums::EToolBarLocation
-	S32 hasCommand(const LLCommandId& commandId) const;
-	S32 addCommand(const LLCommandId& commandId, LLToolBarEnums::EToolBarLocation toolbar, int rank = LLToolBar::RANK_NONE);
-	S32 removeCommand(const LLCommandId& commandId, int& rank);	// Sets the rank the removed command was at, RANK_NONE if not found
-	S32 enableCommand(const LLCommandId& commandId, bool enabled);
-	S32 stopCommandInProgress(const LLCommandId& commandId);
-	S32 flashCommand(const LLCommandId& commandId, bool flash, bool force_flashing = false);
-
-	// Loads the toolbars from the existing user or default settings
-	bool loadToolbars(bool force_default = false);	// return false if load fails
-	
-	// Clears all buttons off the toolbars
-	bool clearToolbars();
-	
-	void setToolBarsVisible(bool visible);
-
-	static bool loadDefaultToolbars();
-	static bool clearAllToolbars();
-	
-	static void startDragTool(S32 x, S32 y, LLToolBarButton* toolbarButton);
-	static bool handleDragTool(S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type);
-	static bool handleDropTool(void* cargo_data, S32 x, S32 y, LLToolBar* toolbar);
-	static void resetDragTool(LLToolBarButton* toolbarButton);
-	LLInventoryObject* getDragItem();
-	LLView* getBottomToolbar() { return mBottomToolbarPanel; }
-	LLToolBar* getToolbar(LLToolBarEnums::EToolBarLocation toolbar) { return mToolbars[toolbar]; }
-	bool isModified() const;
-	
-protected:
-	friend class LLUICtrlFactory;
-	LLToolBarView(const Params&);
-
-	void initFromParams(const Params&);
-
-private:
-	void	saveToolbars() const;
-	bool	addCommandInternal(const LLCommandId& commandId, LLToolBar*	toolbar);
-	void	addToToolset(command_id_list_t& command_list, Toolbar& toolbar) const;
-
-	static void	onToolBarButtonAdded(LLView* button);
-	static void onToolBarButtonRemoved(LLView* button);
-
-	// Pointers to the toolbars handled by the toolbar view
-	LLToolBar*  mToolbars[LLToolBarEnums::TOOLBAR_COUNT];
-	bool		mToolbarsLoaded;
-	
-	bool				mDragStarted;
-	LLToolBarButton*	mDragToolbarButton;
-	LLInventoryObject*	mDragItem;
-	bool				mShowToolbars;
-	LLView*				mBottomToolbarPanel;
-};
-
-extern LLToolBarView* gToolBarView;
-
-#endif  // LL_LLTOOLBARVIEW_H
+/**

+ * @file lltoolbarview.h

+ * @author Merov Linden

+ * @brief User customizable toolbar class

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2011, 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_LLTOOLBARVIEW_H

+#define LL_LLTOOLBARVIEW_H

+

+#include "lluictrl.h"

+#include "lltoolbar.h"

+#include "llcommandmanager.h"

+#include "llinventory.h"

+

+class LLUICtrlFactory;

+

+// Parent of all LLToolBar

+

+class LLToolBarView : public LLUICtrl

+{

+public:

+    // Xui structure of the toolbar panel

+    struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> {};

+

+    // Note: valid children for LLToolBarView are stored in this registry

+    typedef LLDefaultChildRegistry child_registry_t;

+

+    // Xml structure of the toolbars.xml setting

+    // Those live in a toolbars.xml found in app_settings (for the default) and in

+    // the user folder for the user specific (saved) settings

+    struct Toolbar : public LLInitParam::Block<Toolbar>

+    {

+        Mandatory<LLToolBarEnums::ButtonType>   button_display_mode;

+        Multiple<LLCommandId::Params>   commands;

+

+        Toolbar();

+    };

+    struct ToolbarSet : public LLInitParam::Block<ToolbarSet>

+    {

+        Optional<Toolbar>   left_toolbar,

+                            right_toolbar,

+                            bottom_toolbar;

+

+        ToolbarSet();

+    };

+

+    // Derived methods

+    virtual ~LLToolBarView();

+    bool postBuild() override;

+    void draw() override;

+

+    // Toolbar view interface with the rest of the world

+    // Checks if the commandId is being used somewhere in one of the toolbars, returns LLToolBarEnums::EToolBarLocation

+    S32 hasCommand(const LLCommandId& commandId) const;

+    S32 addCommand(const LLCommandId& commandId, LLToolBarEnums::EToolBarLocation toolbar, int rank = LLToolBar::RANK_NONE);

+    S32 removeCommand(const LLCommandId& commandId, int& rank); // Sets the rank the removed command was at, RANK_NONE if not found

+    S32 enableCommand(const LLCommandId& commandId, bool enabled);

+    S32 stopCommandInProgress(const LLCommandId& commandId);

+    S32 flashCommand(const LLCommandId& commandId, bool flash, bool force_flashing = false);

+

+    // Loads the toolbars from the existing user or default settings

+    bool loadToolbars(bool force_default = false);  // return false if load fails

+

+    // Clears all buttons off the toolbars

+    bool clearToolbars();

+

+    void setToolBarsVisible(bool visible);

+

+    static bool loadDefaultToolbars();

+    static bool clearAllToolbars();

+

+    static void startDragTool(S32 x, S32 y, LLToolBarButton* toolbarButton);

+    static bool handleDragTool(S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type);

+    static bool handleDropTool(void* cargo_data, S32 x, S32 y, LLToolBar* toolbar);

+    static void resetDragTool(LLToolBarButton* toolbarButton);

+    LLInventoryObject* getDragItem();

+    LLView* getBottomToolbar() { return mBottomToolbarPanel; }

+    LLToolBar* getToolbar(LLToolBarEnums::EToolBarLocation toolbar) { return mToolbars[toolbar]; }

+    bool isModified() const;

+

+protected:

+    friend class LLUICtrlFactory;

+    LLToolBarView(const Params&);

+

+    void initFromParams(const Params&);

+

+private:

+    void    saveToolbars() const;

+    bool    addCommandInternal(const LLCommandId& commandId, LLToolBar* toolbar);

+    void    addToToolset(command_id_list_t& command_list, Toolbar& toolbar) const;

+

+    static void onToolBarButtonAdded(LLView* button);

+    static void onToolBarButtonRemoved(LLView* button);

+

+    // Pointers to the toolbars handled by the toolbar view

+    LLToolBar*  mToolbars[LLToolBarEnums::TOOLBAR_COUNT];

+    bool        mToolbarsLoaded;

+

+    bool                mDragStarted;

+    LLToolBarButton*    mDragToolbarButton;

+    LLInventoryObject*  mDragItem;

+    bool                mShowToolbars;

+    LLView*             mBottomToolbarPanel;

+};

+

+extern LLToolBarView* gToolBarView;

+

+#endif  // LL_LLTOOLBARVIEW_H