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

diff --git a/indra/newview/llfloatermemleak.h b/indra/newview/llfloatermemleak.h
index 122d4016ca..99f7c0beab 100644
--- a/indra/newview/llfloatermemleak.h
+++ b/indra/newview/llfloatermemleak.h
@@ -1,75 +1,75 @@
-/** 
- * @file llfloatermemleak.h
- * @brief memory leaking simulation window, debug use only
- *
- * $LicenseInfo:firstyear=2004&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_LLFLOATERMEMLEAK_H
-#define LL_LLFLOATERMEMLEAK_H
-
-#include "llfloater.h"
-
-class LLFloaterMemLeak : public LLFloater
-{
-	friend class LLFloaterReg;
-public:
-	/// initialize all the callbacks for the menu
-
-	bool postBuild() override;
-	void draw() override;
-	
-	void onChangeLeakingSpeed();
-	void onChangeMaxMemLeaking();
-	void onClickStart();
-	void onClickStop();
-	void onClickRelease();
-	void onClickClose();
-
-public:
-	void idle() ;
-	void stop() ;
-
-private:
-	
-	LLFloaterMemLeak(const LLSD& key);
-	virtual ~LLFloaterMemLeak();
-	void release() ;
-
-private:
-	enum 
-	{
-		RELEASE = -1 ,
-		STOP,
-		START
-	} ;
-
-	static U32 sMemLeakingSpeed ; //bytes leaked per frame
-	static U32 sMaxLeakedMem ; //maximum allowed leaked memory
-	static U32 sTotalLeaked ;
-	static S32 sStatus ; //0: stop ; >0: start ; <0: release
-	static bool sbAllocationFailed ;
-
-	std::vector<char*> mLeakedMem ;	
-};
-
-#endif // LL_LLFLOATERMEMLEAK_H
+/**

+ * @file llfloatermemleak.h

+ * @brief memory leaking simulation window, debug use only

+ *

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

+#define LL_LLFLOATERMEMLEAK_H

+

+#include "llfloater.h"

+

+class LLFloaterMemLeak : public LLFloater

+{

+    friend class LLFloaterReg;

+public:

+    /// initialize all the callbacks for the menu

+

+    bool postBuild() override;

+    void draw() override;

+

+    void onChangeLeakingSpeed();

+    void onChangeMaxMemLeaking();

+    void onClickStart();

+    void onClickStop();

+    void onClickRelease();

+    void onClickClose();

+

+public:

+    void idle() ;

+    void stop() ;

+

+private:

+

+    LLFloaterMemLeak(const LLSD& key);

+    virtual ~LLFloaterMemLeak();

+    void release() ;

+

+private:

+    enum

+    {

+        RELEASE = -1 ,

+        STOP,

+        START

+    } ;

+

+    static U32 sMemLeakingSpeed ; //bytes leaked per frame

+    static U32 sMaxLeakedMem ; //maximum allowed leaked memory

+    static U32 sTotalLeaked ;

+    static S32 sStatus ; //0: stop ; >0: start ; <0: release

+    static bool sbAllocationFailed ;

+

+    std::vector<char*> mLeakedMem ;

+};

+

+#endif // LL_LLFLOATERMEMLEAK_H