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

diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h
index 8509edd8f1..441283da99 100644
--- a/indra/newview/llsidepaneltaskinfo.h
+++ b/indra/newview/llsidepaneltaskinfo.h
@@ -1,170 +1,170 @@
-/** 
- * @file llsidepaneltaskinfo.h
- * @brief LLSidepanelTaskInfo class header file
- *
- * $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_LLSIDEPANELTASKINFO_H
-#define LL_LLSIDEPANELTASKINFO_H
-
-#include "lluuid.h"
-#include "llpanel.h"
-#include "llselectmgr.h"
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLSidepanelTaskInfo
-//
-// Panel for permissions of an object.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-class LLCheckBoxCtrl;
-class LLComboBox;
-class LLNameBox;
-class LLViewerObject;
-class LLTextBase;
-
-class LLSidepanelTaskInfo : public LLPanel
-{
-public:
-	LLSidepanelTaskInfo();
-	virtual ~LLSidepanelTaskInfo();
-
-	bool postBuild() override;
-	void onVisibilityChange (bool new_visibility) override;
-
-	void setObjectSelection(LLObjectSelectionHandle selection);
-
-	const LLUUID& getSelectedUUID();
-	LLViewerObject* getFirstSelectedObject();
-
-	static LLSidepanelTaskInfo *getActivePanel();
-    void dirty();
-    static void onIdle( void* user_data );
-protected:
-	void refresh() override;	// refresh all labels as needed
-	void save();
-	void updateVerbs();
-
-	void refreshAll(); // ignore current keyboard focus and update all fields
-
-	// statics
-	static void onClickClaim(void*);
-	static void onClickRelease(void*);
-		   void onClickGroup();
-		   void cbGroupID(LLUUID group_id);
-	static void onClickDeedToGroup(void*);
-
-	static void onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32 perm);
-
-	static void onCommitGroupShare(LLUICtrl *ctrl, void *data);
-
-	static void onCommitEveryoneMove(LLUICtrl *ctrl, void *data);
-	static void onCommitEveryoneCopy(LLUICtrl *ctrl, void *data);
-
-	static void onCommitNextOwnerModify(LLUICtrl* ctrl, void* data);
-	static void onCommitNextOwnerCopy(LLUICtrl* ctrl, void* data);
-	static void onCommitNextOwnerTransfer(LLUICtrl* ctrl, void* data);
-	
-	static void onCommitName(LLUICtrl* ctrl, void* data);
-	static void onCommitDesc(LLUICtrl* ctrl, void* data);
-
-	static void onCommitSaleInfo(LLUICtrl* ctrl, void* data);
-	static void onCommitSaleType(LLUICtrl* ctrl, void* data);	
-	void setAllSaleInfo();
-
-	static void	onCommitClickAction(LLUICtrl* ctrl, void* data);
-	static void onCommitIncludeInSearch(LLUICtrl* ctrl, void*);
-
-	static void	doClickAction(U8 click_action);
-	void disableAll();
-	void disablePermissions();
-
-private:
-	LLNameBox*		mLabelGroupName;		// group name
-
-	LLUUID			mCreatorID;
-	LLUUID			mOwnerID;
-	LLUUID			mLastOwnerID;
-    
-    bool mIsDirty;
-
-protected:
-	void 						onOpenButtonClicked();
-	void 						onPayButtonClicked();
-	void 						onBuyButtonClicked();
-	void 						onDetailsButtonClicked();
-private:
-	LLButton*					mOpenBtn;
-	LLButton*					mPayBtn;
-	LLButton*					mBuyBtn;
-	LLButton*					mDetailsBtn;
-	LLButton*					mDeedBtn;
-
-protected:
-	LLViewerObject*				getObject();
-private:
-	LLPointer<LLViewerObject>	mObject;
-	LLObjectSelectionHandle		mObjectSelection;
-
-    // mVisibleDebugPermissions doesn't nessesarily matche state
-    // of viewes and is primarily for floater resize
-    bool                        mVisibleDebugPermissions;
-	static LLSidepanelTaskInfo* sActivePanel;
-	
-private:
-	// Pointers cached here to speed up the "disableAll" function which gets called on idle
-	LLUICtrl*	mDAPermModify;
-	LLUICtrl*	mDACreatorName;
-	LLView*		mDAOwner;
-	LLUICtrl*	mDAOwnerName;
-	LLView*		mDAButtonSetGroup;
-	LLUICtrl*	mDAObjectName;
-	LLView*		mDAName;
-	LLView*		mDADescription;
-	LLUICtrl*	mDAObjectDescription;
-	LLUICtrl*	mDACheckboxShareWithGroup;
-	LLView*		mDAButtonDeed;
-	LLUICtrl*	mDACheckboxAllowEveryoneMove;
-	LLUICtrl*	mDACheckboxAllowEveryoneCopy;
-	LLUICtrl*	mDACheckboxNextOwnerCanModify;
-	LLUICtrl*	mDACheckboxNextOwnerCanCopy;
-	LLUICtrl*	mDACheckboxNextOwnerCanTransfer;
-	LLUICtrl*	mDACheckboxForSale;
-	LLUICtrl*	mDASearchCheck;
-	LLComboBox*	mDAComboSaleType;
-	LLUICtrl*	mDAEditCost;
-	LLView*		mDALabelClickAction;
-	LLComboBox*	mDAComboClickAction;
-	LLTextBase* mDAPathfindingAttributes;
-    LLUICtrl*   mDAB;
-    LLUICtrl*   mDAO;
-    LLUICtrl*   mDAG;
-    LLUICtrl*   mDAE;
-    LLUICtrl*   mDAN;
-    LLUICtrl*   mDAF;
-
-    boost::signals2::connection mSelectionUpdateSlot;
-};
-
-
-#endif // LL_LLSIDEPANELTASKINFO_H
+/**

+ * @file llsidepaneltaskinfo.h

+ * @brief LLSidepanelTaskInfo class header file

+ *

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

+#define LL_LLSIDEPANELTASKINFO_H

+

+#include "lluuid.h"

+#include "llpanel.h"

+#include "llselectmgr.h"

+

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+// Class LLSidepanelTaskInfo

+//

+// Panel for permissions of an object.

+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+

+class LLCheckBoxCtrl;

+class LLComboBox;

+class LLNameBox;

+class LLViewerObject;

+class LLTextBase;

+

+class LLSidepanelTaskInfo : public LLPanel

+{

+public:

+    LLSidepanelTaskInfo();

+    virtual ~LLSidepanelTaskInfo();

+

+    bool postBuild() override;

+    void onVisibilityChange (bool new_visibility) override;

+

+    void setObjectSelection(LLObjectSelectionHandle selection);

+

+    const LLUUID& getSelectedUUID();

+    LLViewerObject* getFirstSelectedObject();

+

+    static LLSidepanelTaskInfo *getActivePanel();

+    void dirty();

+    static void onIdle( void* user_data );

+protected:

+    void refresh() override;    // refresh all labels as needed

+    void save();

+    void updateVerbs();

+

+    void refreshAll(); // ignore current keyboard focus and update all fields

+

+    // statics

+    static void onClickClaim(void*);

+    static void onClickRelease(void*);

+           void onClickGroup();

+           void cbGroupID(LLUUID group_id);

+    static void onClickDeedToGroup(void*);

+

+    static void onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32 perm);

+

+    static void onCommitGroupShare(LLUICtrl *ctrl, void *data);

+

+    static void onCommitEveryoneMove(LLUICtrl *ctrl, void *data);

+    static void onCommitEveryoneCopy(LLUICtrl *ctrl, void *data);

+

+    static void onCommitNextOwnerModify(LLUICtrl* ctrl, void* data);

+    static void onCommitNextOwnerCopy(LLUICtrl* ctrl, void* data);

+    static void onCommitNextOwnerTransfer(LLUICtrl* ctrl, void* data);

+

+    static void onCommitName(LLUICtrl* ctrl, void* data);

+    static void onCommitDesc(LLUICtrl* ctrl, void* data);

+

+    static void onCommitSaleInfo(LLUICtrl* ctrl, void* data);

+    static void onCommitSaleType(LLUICtrl* ctrl, void* data);

+    void setAllSaleInfo();

+

+    static void onCommitClickAction(LLUICtrl* ctrl, void* data);

+    static void onCommitIncludeInSearch(LLUICtrl* ctrl, void*);

+

+    static void doClickAction(U8 click_action);

+    void disableAll();

+    void disablePermissions();

+

+private:

+    LLNameBox*      mLabelGroupName;        // group name

+

+    LLUUID          mCreatorID;

+    LLUUID          mOwnerID;

+    LLUUID          mLastOwnerID;

+

+    bool mIsDirty;

+

+protected:

+    void                        onOpenButtonClicked();

+    void                        onPayButtonClicked();

+    void                        onBuyButtonClicked();

+    void                        onDetailsButtonClicked();

+private:

+    LLButton*                   mOpenBtn;

+    LLButton*                   mPayBtn;

+    LLButton*                   mBuyBtn;

+    LLButton*                   mDetailsBtn;

+    LLButton*                   mDeedBtn;

+

+protected:

+    LLViewerObject*             getObject();

+private:

+    LLPointer<LLViewerObject>   mObject;

+    LLObjectSelectionHandle     mObjectSelection;

+

+    // mVisibleDebugPermissions doesn't nessesarily matche state

+    // of viewes and is primarily for floater resize

+    bool                        mVisibleDebugPermissions;

+    static LLSidepanelTaskInfo* sActivePanel;

+

+private:

+    // Pointers cached here to speed up the "disableAll" function which gets called on idle

+    LLUICtrl*   mDAPermModify;

+    LLUICtrl*   mDACreatorName;

+    LLView*     mDAOwner;

+    LLUICtrl*   mDAOwnerName;

+    LLView*     mDAButtonSetGroup;

+    LLUICtrl*   mDAObjectName;

+    LLView*     mDAName;

+    LLView*     mDADescription;

+    LLUICtrl*   mDAObjectDescription;

+    LLUICtrl*   mDACheckboxShareWithGroup;

+    LLView*     mDAButtonDeed;

+    LLUICtrl*   mDACheckboxAllowEveryoneMove;

+    LLUICtrl*   mDACheckboxAllowEveryoneCopy;

+    LLUICtrl*   mDACheckboxNextOwnerCanModify;

+    LLUICtrl*   mDACheckboxNextOwnerCanCopy;

+    LLUICtrl*   mDACheckboxNextOwnerCanTransfer;

+    LLUICtrl*   mDACheckboxForSale;

+    LLUICtrl*   mDASearchCheck;

+    LLComboBox* mDAComboSaleType;

+    LLUICtrl*   mDAEditCost;

+    LLView*     mDALabelClickAction;

+    LLComboBox* mDAComboClickAction;

+    LLTextBase* mDAPathfindingAttributes;

+    LLUICtrl*   mDAB;

+    LLUICtrl*   mDAO;

+    LLUICtrl*   mDAG;

+    LLUICtrl*   mDAE;

+    LLUICtrl*   mDAN;

+    LLUICtrl*   mDAF;

+

+    boost::signals2::connection mSelectionUpdateSlot;

+};

+

+

+#endif // LL_LLSIDEPANELTASKINFO_H