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

diff --git a/indra/llfilesystem/lllfsthread.h b/indra/llfilesystem/lllfsthread.h
index 3038e1be12..51ef2d39ab 100644
--- a/indra/llfilesystem/lllfsthread.h
+++ b/indra/llfilesystem/lllfsthread.h
@@ -1,140 +1,140 @@
-/** 
- * @file lllfsthread.h
- * @brief LLLFSThread base class
- *
- * $LicenseInfo:firstyear=2000&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_LLLFSTHREAD_H
-#define LL_LLLFSTHREAD_H
-
-#include <queue>
-#include <string>
-#include <map>
-#include <set>
-
-#include "llpointer.h"
-#include "llqueuedthread.h"
-
-//============================================================================
-// Threaded Local File System
-//============================================================================
-
-class LLLFSThread : public LLQueuedThread
-{
-	//------------------------------------------------------------------------
-public:
-	enum operation_t {
-		FILE_READ,
-		FILE_WRITE,
-		FILE_RENAME,
-		FILE_REMOVE
-	};
-
-	//------------------------------------------------------------------------
-public:
-
-	class Responder : public LLThreadSafeRefCount
-	{
-	protected:
-		~Responder();
-	public:
-		virtual void completed(S32 bytes) = 0;
-	};
-
-	class Request : public QueuedRequest
-	{
-	protected:
-		virtual ~Request(); // use deleteRequest()
-		
-	public:
-		Request(LLLFSThread* thread,
-				handle_t handle,
-				operation_t op, const std::string& filename,
-				U8* buffer, S32 offset, S32 numbytes,
-				Responder* responder);
-
-		S32 getBytes()
-		{
-			return mBytes;
-		}
-		S32 getBytesRead()
-		{
-			return mBytesRead;
-		}
-		S32 getOperation()
-		{
-			return mOperation;
-		}
-		U8* getBuffer()
-		{
-			return mBuffer;
-		}
-		const std::string& getFilename()
-		{
-			return mFileName;
-		}
-		
-		/*virtual*/ bool processRequest();
-		/*virtual*/ void finishRequest(bool completed);
-		/*virtual*/ void deleteRequest();
-		
-	private:
-		LLLFSThread* mThread;
-		operation_t mOperation;
-		
-		std::string mFileName;
-		
-		U8* mBuffer;	// dest for reads, source for writes, new UUID for rename
-		S32 mOffset;	// offset into file, -1 = append (WRITE only)
-		S32 mBytes;		// bytes to read from file, -1 = all
-		S32 mBytesRead;	// bytes read from file
-
-		LLPointer<Responder> mResponder;
-	};
-
-	//------------------------------------------------------------------------
-public:
-	LLLFSThread(bool threaded = true);
-	~LLLFSThread();
-
-	// Return a Request handle
-	handle_t read(const std::string& filename,	/* Flawfinder: ignore */ 
-				  U8* buffer, S32 offset, S32 numbytes,
-				  Responder* responder);
-	handle_t write(const std::string& filename,
-				   U8* buffer, S32 offset, S32 numbytes,
-				   Responder* responder);
-	
-	// static initializers
-	static void initClass(bool local_is_threaded = true); // Setup sLocal
-	static S32 updateClass(U32 ms_elapsed);
-	static void cleanupClass();		// Delete sLocal
-	
-public:
-	static LLLFSThread* sLocal;		// Default local file thread
-};
-
-//============================================================================
-
-
-#endif // LL_LLLFSTHREAD_H
+/**

+ * @file lllfsthread.h

+ * @brief LLLFSThread base class

+ *

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

+#define LL_LLLFSTHREAD_H

+

+#include <queue>

+#include <string>

+#include <map>

+#include <set>

+

+#include "llpointer.h"

+#include "llqueuedthread.h"

+

+//============================================================================

+// Threaded Local File System

+//============================================================================

+

+class LLLFSThread : public LLQueuedThread

+{

+    //------------------------------------------------------------------------

+public:

+    enum operation_t {

+        FILE_READ,

+        FILE_WRITE,

+        FILE_RENAME,

+        FILE_REMOVE

+    };

+

+    //------------------------------------------------------------------------

+public:

+

+    class Responder : public LLThreadSafeRefCount

+    {

+    protected:

+        ~Responder();

+    public:

+        virtual void completed(S32 bytes) = 0;

+    };

+

+    class Request : public QueuedRequest

+    {

+    protected:

+        virtual ~Request(); // use deleteRequest()

+

+    public:

+        Request(LLLFSThread* thread,

+                handle_t handle,

+                operation_t op, const std::string& filename,

+                U8* buffer, S32 offset, S32 numbytes,

+                Responder* responder);

+

+        S32 getBytes()

+        {

+            return mBytes;

+        }

+        S32 getBytesRead()

+        {

+            return mBytesRead;

+        }

+        S32 getOperation()

+        {

+            return mOperation;

+        }

+        U8* getBuffer()

+        {

+            return mBuffer;

+        }

+        const std::string& getFilename()

+        {

+            return mFileName;

+        }

+

+        /*virtual*/ bool processRequest();

+        /*virtual*/ void finishRequest(bool completed);

+        /*virtual*/ void deleteRequest();

+

+    private:

+        LLLFSThread* mThread;

+        operation_t mOperation;

+

+        std::string mFileName;

+

+        U8* mBuffer;    // dest for reads, source for writes, new UUID for rename

+        S32 mOffset;    // offset into file, -1 = append (WRITE only)

+        S32 mBytes;     // bytes to read from file, -1 = all

+        S32 mBytesRead; // bytes read from file

+

+        LLPointer<Responder> mResponder;

+    };

+

+    //------------------------------------------------------------------------

+public:

+    LLLFSThread(bool threaded = true);

+    ~LLLFSThread();

+

+    // Return a Request handle

+    handle_t read(const std::string& filename,  /* Flawfinder: ignore */

+                  U8* buffer, S32 offset, S32 numbytes,

+                  Responder* responder);

+    handle_t write(const std::string& filename,

+                   U8* buffer, S32 offset, S32 numbytes,

+                   Responder* responder);

+

+    // static initializers

+    static void initClass(bool local_is_threaded = true); // Setup sLocal

+    static S32 updateClass(U32 ms_elapsed);

+    static void cleanupClass();     // Delete sLocal

+

+public:

+    static LLLFSThread* sLocal;     // Default local file thread

+};

+

+//============================================================================

+

+

+#endif // LL_LLLFSTHREAD_H