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

diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index c23327aa88..6bf30f001d 100644
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -1,120 +1,120 @@
-/** 
- * @file llfloaterbulkpermissions.h
- * @brief Allow multiple task inventory properties to be set in one go.
- * @author Michelle2 Zenovka
- *
- * $LicenseInfo:firstyear=2008&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_LLBULKPERMISSION_H
-#define LL_LLBULKPERMISSION_H
-
-#include "llinventory.h"
-#include "llviewerobject.h"
-#include "llvoinventorylistener.h"
-#include "lluuid.h"
-
-#include "llfloater.h"
-#include "llscrolllistctrl.h"
-
-class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener
-{
-	friend class LLFloaterReg;
-public:
-
-	bool postBuild();
-
-private:
-	
-	LLFloaterBulkPermission(const LLSD& seed);	
-	virtual ~LLFloaterBulkPermission() {}
-
-	bool start(); // returns true if the queue has started, otherwise false.
-	bool nextObject();
-	bool popNext();
-
-	// This is the callback method for the viewer object currently
-	// being worked on.
-	/*virtual*/ void inventoryChanged(LLViewerObject* obj,
-								 LLInventoryObject::object_list_t* inv,
-								 S32 serial_num,
-								 void* queue);
-	
-	// This is called by inventoryChanged
-	void handleInventory(LLViewerObject* viewer_obj,
-								LLInventoryObject::object_list_t* inv);
-
-
-	void updateInventory(LLViewerObject* object,
-								LLViewerInventoryItem* item,
-								U8 key,
-								bool is_new);
-
-	void onCloseBtn();
-	void onOkBtn();
-	void onApplyBtn();
-	void onCommitCopy();
-	void onCheckAll() { doCheckUncheckAll(true); }
-	void onUncheckAll() { doCheckUncheckAll(false); }
-	
-	// returns true if this is done
-	bool isDone() const { return (mCurrentObjectID.isNull() || (mObjectIDs.size() == 0)); }
-
-	//Read the settings and Apply the permissions
-	void doApply();
-	void doCheckUncheckAll(bool check);
-
-private:
-	// UI
-	LLScrollListCtrl* mMessages;
-	LLButton* mCloseBtn;
-
-	// Object Queue
-	std::vector<LLUUID> mObjectIDs;
-	LLUUID mCurrentObjectID;
-	bool mDone;
-
-	bool mBulkChangeIncludeAnimations;
-	bool mBulkChangeIncludeBodyParts;
-	bool mBulkChangeIncludeClothing;
-	bool mBulkChangeIncludeGestures;
-	bool mBulkChangeIncludeNotecards;
-	bool mBulkChangeIncludeObjects;
-	bool mBulkChangeIncludeScripts;
-	bool mBulkChangeIncludeSounds;
-	bool mBulkChangeIncludeTextures;
-	bool mBulkChangeIncludeSettings;
-    bool mBulkChangeIncludeMaterials;
-
-	bool mBulkChangeShareWithGroup;
-	bool mBulkChangeEveryoneCopy;
-	bool mBulkChangeNextOwnerModify;
-	bool mBulkChangeNextOwnerCopy;
-	bool mBulkChangeNextOwnerTransfer;
-
-	LLUUID mID;
-
-	const char* mStartString;
-};
-
-#endif
-
+/**

+ * @file llfloaterbulkpermissions.h

+ * @brief Allow multiple task inventory properties to be set in one go.

+ * @author Michelle2 Zenovka

+ *

+ * $LicenseInfo:firstyear=2008&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_LLBULKPERMISSION_H

+#define LL_LLBULKPERMISSION_H

+

+#include "llinventory.h"

+#include "llviewerobject.h"

+#include "llvoinventorylistener.h"

+#include "lluuid.h"

+

+#include "llfloater.h"

+#include "llscrolllistctrl.h"

+

+class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener

+{

+    friend class LLFloaterReg;

+public:

+

+    bool postBuild();

+

+private:

+

+    LLFloaterBulkPermission(const LLSD& seed);

+    virtual ~LLFloaterBulkPermission() {}

+

+    bool start(); // returns true if the queue has started, otherwise false.

+    bool nextObject();

+    bool popNext();

+

+    // This is the callback method for the viewer object currently

+    // being worked on.

+    /*virtual*/ void inventoryChanged(LLViewerObject* obj,

+                                 LLInventoryObject::object_list_t* inv,

+                                 S32 serial_num,

+                                 void* queue);

+

+    // This is called by inventoryChanged

+    void handleInventory(LLViewerObject* viewer_obj,

+                                LLInventoryObject::object_list_t* inv);

+

+

+    void updateInventory(LLViewerObject* object,

+                                LLViewerInventoryItem* item,

+                                U8 key,

+                                bool is_new);

+

+    void onCloseBtn();

+    void onOkBtn();

+    void onApplyBtn();

+    void onCommitCopy();

+    void onCheckAll() { doCheckUncheckAll(true); }

+    void onUncheckAll() { doCheckUncheckAll(false); }

+

+    // returns true if this is done

+    bool isDone() const { return (mCurrentObjectID.isNull() || (mObjectIDs.size() == 0)); }

+

+    //Read the settings and Apply the permissions

+    void doApply();

+    void doCheckUncheckAll(bool check);

+

+private:

+    // UI

+    LLScrollListCtrl* mMessages;

+    LLButton* mCloseBtn;

+

+    // Object Queue

+    std::vector<LLUUID> mObjectIDs;

+    LLUUID mCurrentObjectID;

+    bool mDone;

+

+    bool mBulkChangeIncludeAnimations;

+    bool mBulkChangeIncludeBodyParts;

+    bool mBulkChangeIncludeClothing;

+    bool mBulkChangeIncludeGestures;

+    bool mBulkChangeIncludeNotecards;

+    bool mBulkChangeIncludeObjects;

+    bool mBulkChangeIncludeScripts;

+    bool mBulkChangeIncludeSounds;

+    bool mBulkChangeIncludeTextures;

+    bool mBulkChangeIncludeSettings;

+    bool mBulkChangeIncludeMaterials;

+

+    bool mBulkChangeShareWithGroup;

+    bool mBulkChangeEveryoneCopy;

+    bool mBulkChangeNextOwnerModify;

+    bool mBulkChangeNextOwnerCopy;

+    bool mBulkChangeNextOwnerTransfer;

+

+    LLUUID mID;

+

+    const char* mStartString;

+};

+

+#endif

+