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

diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index 34df7b593d..a3dcf244bc 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -1,197 +1,197 @@
-/** 
- * @file llfloatertools.h
- * @brief The edit tools, including move, position, land, etc.
- *
- * $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_LLFLOATERTOOLS_H
-#define LL_LLFLOATERTOOLS_H
-
-#include "llfloater.h"
-#include "llcoord.h"
-#include "llparcelselection.h"
-
-class LLButton;
-class LLCheckBoxCtrl;
-class LLComboBox;
-class LLPanelPermissions;
-class LLPanelObject;
-class LLPanelVolume;
-class LLPanelContents;
-class LLPanelFace;
-class LLPanelLandInfo;
-class LLRadioGroup;
-class LLSlider;
-class LLTabContainer;
-class LLTextBox;
-class LLTool;
-class LLParcelSelection;
-class LLObjectSelection;
-class LLLandImpactsObserver;
-
-typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
-
-class LLFloaterTools
-: public LLFloater
-{
-public:
-	virtual	bool	postBuild();
-	static	void*	createPanelPermissions(void*	vdata);
-	static	void*	createPanelObject(void*	vdata);
-	static	void*	createPanelVolume(void*	vdata);
-	static	void*	createPanelFace(void*	vdata);
-	static	void*	createPanelContents(void*	vdata);
-	static	void*	createPanelLandInfo(void*	vdata);
-
-	LLFloaterTools(const LLSD& key);
-	virtual ~LLFloaterTools();
-
-	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ bool canClose();
-	/*virtual*/ void onClose(bool app_quitting);
-	/*virtual*/ void draw();
-	/*virtual*/ void onFocusReceived();
-
-	// call this once per frame to handle visibility, rect location,
-	// button highlights, etc.
-	void updatePopup(LLCoordGL center, MASK mask);
-
-	// When the floater is going away, reset any options that need to be 
-	// cleared.
-	void resetToolState();
-
-	enum EInfoPanel
-	{
-		PANEL_GENERAL=0,
-		PANEL_OBJECT,
-		PANEL_FEATURES,
-		PANEL_FACE,
-		PANEL_CONTENTS,
-		PANEL_COUNT
-	};
-
-	void dirty();
-	void showPanel(EInfoPanel panel);
-
-	void setStatusText(const std::string& text);
-	static void setEditTool(void* data);
-	void setTool(const LLSD& user_data);
-	void saveLastTool();
-	void updateLandImpacts();
-
-	static void setGridMode(S32 mode);
-
-	LLPanelFace* getPanelFace() { return mPanelFace; }
-
-private:
-	void refresh();
-	static void setObjectType( LLPCode pcode );
-	void onClickGridOptions();
-
-public:
-	LLButton		*mBtnFocus;
-	LLButton		*mBtnMove;
-	LLButton		*mBtnEdit;
-	LLButton		*mBtnCreate;
-	LLButton		*mBtnLand;
-
-	LLTextBox		*mTextStatus;
-
-	// Focus buttons
-	LLRadioGroup*	mRadioGroupFocus;
-
-	// Move buttons
-	LLRadioGroup*	mRadioGroupMove;
-
-	// Edit buttons
-	LLRadioGroup*	mRadioGroupEdit;
-
-	LLCheckBoxCtrl	*mCheckSelectIndividual;
-	LLButton*		mBtnLink;
-	LLButton*		mBtnUnlink;
-
-	LLCheckBoxCtrl*	mCheckSnapToGrid;
-	LLButton*		mBtnGridOptions;
-	LLComboBox*		mComboGridMode;
-	LLCheckBoxCtrl*	mCheckStretchUniform;
-	LLCheckBoxCtrl*	mCheckStretchTexture;
-
-	// !HACK! Replacement of mCheckStretchUniform label because LLCheckBoxCtrl
-	//  doesn't support word_wrap of its label. Need to fix truncation bug EXT-6658
-	LLTextBox*		mCheckStretchUniformLabel;
-
-	LLButton	*mBtnRotateLeft;
-	LLButton	*mBtnRotateReset;
-	LLButton	*mBtnRotateRight;
-
-	LLButton	*mBtnDelete;
-	LLButton	*mBtnDuplicate;
-	LLButton	*mBtnDuplicateInPlace;
-
-	// Create buttons
-	LLCheckBoxCtrl	*mCheckSticky;
-	LLCheckBoxCtrl	*mCheckCopySelection;
-	LLCheckBoxCtrl	*mCheckCopyCenters;
-	LLCheckBoxCtrl	*mCheckCopyRotates;
-
-	// Land buttons
-	LLRadioGroup*	mRadioGroupLand;
-	LLSlider		*mSliderDozerSize;
-	LLSlider		*mSliderDozerForce;
-
-	LLButton		*mBtnApplyToSelection;
-
-	std::vector<LLButton*>	mButtons;//[ 15 ];
-
-	LLTabContainer	*mTab;
-	LLPanelPermissions		*mPanelPermissions;
-	LLPanelObject			*mPanelObject;
-	LLPanelVolume			*mPanelVolume;
-	LLPanelContents			*mPanelContents;
-	LLPanelFace				*mPanelFace;
-	LLPanelLandInfo			*mPanelLandInfo;
-
-	LLViewBorder*			mCostTextBorder;
-
-	LLTabContainer*			mTabLand;
-
-	LLLandImpactsObserver*  mLandImpactsObserver;
-
-	LLParcelSelectionHandle	mParcelSelection;
-	LLObjectSelectionHandle	mObjectSelection;
-
-private:
-	bool					mDirty;
-	bool                    mHasSelection;
-
-	std::map<std::string, std::string> mStatusText;
-
-public:
-	static bool		sShowObjectCost;
-	static bool		sPreviousFocusOnAvatar;
-	
-};
-
-extern LLFloaterTools *gFloaterTools;
-
-#endif
+/**

+ * @file llfloatertools.h

+ * @brief The edit tools, including move, position, land, etc.

+ *

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

+#define LL_LLFLOATERTOOLS_H

+

+#include "llfloater.h"

+#include "llcoord.h"

+#include "llparcelselection.h"

+

+class LLButton;

+class LLCheckBoxCtrl;

+class LLComboBox;

+class LLPanelPermissions;

+class LLPanelObject;

+class LLPanelVolume;

+class LLPanelContents;

+class LLPanelFace;

+class LLPanelLandInfo;

+class LLRadioGroup;

+class LLSlider;

+class LLTabContainer;

+class LLTextBox;

+class LLTool;

+class LLParcelSelection;

+class LLObjectSelection;

+class LLLandImpactsObserver;

+

+typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;

+

+class LLFloaterTools

+: public LLFloater

+{

+public:

+    virtual bool    postBuild();

+    static  void*   createPanelPermissions(void*    vdata);

+    static  void*   createPanelObject(void* vdata);

+    static  void*   createPanelVolume(void* vdata);

+    static  void*   createPanelFace(void*   vdata);

+    static  void*   createPanelContents(void*   vdata);

+    static  void*   createPanelLandInfo(void*   vdata);

+

+    LLFloaterTools(const LLSD& key);

+    virtual ~LLFloaterTools();

+

+    /*virtual*/ void onOpen(const LLSD& key);

+    /*virtual*/ bool canClose();

+    /*virtual*/ void onClose(bool app_quitting);

+    /*virtual*/ void draw();

+    /*virtual*/ void onFocusReceived();

+

+    // call this once per frame to handle visibility, rect location,

+    // button highlights, etc.

+    void updatePopup(LLCoordGL center, MASK mask);

+

+    // When the floater is going away, reset any options that need to be

+    // cleared.

+    void resetToolState();

+

+    enum EInfoPanel

+    {

+        PANEL_GENERAL=0,

+        PANEL_OBJECT,

+        PANEL_FEATURES,

+        PANEL_FACE,

+        PANEL_CONTENTS,

+        PANEL_COUNT

+    };

+

+    void dirty();

+    void showPanel(EInfoPanel panel);

+

+    void setStatusText(const std::string& text);

+    static void setEditTool(void* data);

+    void setTool(const LLSD& user_data);

+    void saveLastTool();

+    void updateLandImpacts();

+

+    static void setGridMode(S32 mode);

+

+    LLPanelFace* getPanelFace() { return mPanelFace; }

+

+private:

+    void refresh();

+    static void setObjectType( LLPCode pcode );

+    void onClickGridOptions();

+

+public:

+    LLButton        *mBtnFocus;

+    LLButton        *mBtnMove;

+    LLButton        *mBtnEdit;

+    LLButton        *mBtnCreate;

+    LLButton        *mBtnLand;

+

+    LLTextBox       *mTextStatus;

+

+    // Focus buttons

+    LLRadioGroup*   mRadioGroupFocus;

+

+    // Move buttons

+    LLRadioGroup*   mRadioGroupMove;

+

+    // Edit buttons

+    LLRadioGroup*   mRadioGroupEdit;

+

+    LLCheckBoxCtrl  *mCheckSelectIndividual;

+    LLButton*       mBtnLink;

+    LLButton*       mBtnUnlink;

+

+    LLCheckBoxCtrl* mCheckSnapToGrid;

+    LLButton*       mBtnGridOptions;

+    LLComboBox*     mComboGridMode;

+    LLCheckBoxCtrl* mCheckStretchUniform;

+    LLCheckBoxCtrl* mCheckStretchTexture;

+

+    // !HACK! Replacement of mCheckStretchUniform label because LLCheckBoxCtrl

+    //  doesn't support word_wrap of its label. Need to fix truncation bug EXT-6658

+    LLTextBox*      mCheckStretchUniformLabel;

+

+    LLButton    *mBtnRotateLeft;

+    LLButton    *mBtnRotateReset;

+    LLButton    *mBtnRotateRight;

+

+    LLButton    *mBtnDelete;

+    LLButton    *mBtnDuplicate;

+    LLButton    *mBtnDuplicateInPlace;

+

+    // Create buttons

+    LLCheckBoxCtrl  *mCheckSticky;

+    LLCheckBoxCtrl  *mCheckCopySelection;

+    LLCheckBoxCtrl  *mCheckCopyCenters;

+    LLCheckBoxCtrl  *mCheckCopyRotates;

+

+    // Land buttons

+    LLRadioGroup*   mRadioGroupLand;

+    LLSlider        *mSliderDozerSize;

+    LLSlider        *mSliderDozerForce;

+

+    LLButton        *mBtnApplyToSelection;

+

+    std::vector<LLButton*>  mButtons;//[ 15 ];

+

+    LLTabContainer  *mTab;

+    LLPanelPermissions      *mPanelPermissions;

+    LLPanelObject           *mPanelObject;

+    LLPanelVolume           *mPanelVolume;

+    LLPanelContents         *mPanelContents;

+    LLPanelFace             *mPanelFace;

+    LLPanelLandInfo         *mPanelLandInfo;

+

+    LLViewBorder*           mCostTextBorder;

+

+    LLTabContainer*         mTabLand;

+

+    LLLandImpactsObserver*  mLandImpactsObserver;

+

+    LLParcelSelectionHandle mParcelSelection;

+    LLObjectSelectionHandle mObjectSelection;

+

+private:

+    bool                    mDirty;

+    bool                    mHasSelection;

+

+    std::map<std::string, std::string> mStatusText;

+

+public:

+    static bool     sShowObjectCost;

+    static bool     sPreviousFocusOnAvatar;

+

+};

+

+extern LLFloaterTools *gFloaterTools;

+

+#endif