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

diff --git a/indra/llcommon/llqueuedthread.h b/indra/llcommon/llqueuedthread.h
index 70d87e7c04..0f69f7640f 100644
--- a/indra/llcommon/llqueuedthread.h
+++ b/indra/llcommon/llqueuedthread.h
@@ -1,178 +1,178 @@
-/** 
- * @file llqueuedthread.h
- * @brief
- *
- * $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_LLQUEUEDTHREAD_H
-#define LL_LLQUEUEDTHREAD_H
-
-#include <queue>
-#include <string>
-#include <map>
-#include <set>
-
-#include "llatomic.h"
-
-#include "llthread.h"
-#include "llsimplehash.h"
-#include "workqueue.h"
-
-//============================================================================
-// Note: ~LLQueuedThread is O(N) N=# of queued threads, assumed to be small
-//   It is assumed that LLQueuedThreads are rarely created/destroyed.
-
-class LL_COMMON_API LLQueuedThread : public LLThread
-{
-	//------------------------------------------------------------------------
-public:
-	enum status_t {
-		STATUS_EXPIRED = -1,
-		STATUS_UNKNOWN = 0,
-		STATUS_QUEUED = 1,
-		STATUS_INPROGRESS = 2,
-		STATUS_COMPLETE = 3,
-		STATUS_ABORTED = 4,
-		STATUS_DELETE = 5
-	};
-	enum flags_t {
-		FLAG_AUTO_COMPLETE = 1,
-		FLAG_AUTO_DELETE = 2, // child-class dependent
-		FLAG_ABORT = 4
-	};
-
-	typedef U32 handle_t;
-	
-	//------------------------------------------------------------------------
-public:
-
-	class LL_COMMON_API QueuedRequest : public LLSimpleHashEntry<handle_t>
-	{
-		friend class LLQueuedThread;
-		
-	protected:
-		virtual ~QueuedRequest(); // use deleteRequest()
-		
-	public:
-		QueuedRequest(handle_t handle, U32 flags = 0);
-
-		status_t getStatus()
-		{
-			return mStatus;
-		}
-		U32 getFlags() const
-		{
-			return mFlags;
-		}
-		
-	protected:
-		status_t setStatus(status_t newstatus)
-		{
-			status_t oldstatus = mStatus;
-			mStatus = newstatus;
-			return oldstatus;
-		}
-		void setFlags(U32 flags)
-		{
-			// NOTE: flags are |'d
-			mFlags |= flags;
-		}
-		
-		virtual bool processRequest() = 0; // Return true when request has completed
-		virtual void finishRequest(bool completed); // Always called from thread after request has completed or aborted
-		virtual void deleteRequest(); // Only method to delete a request
-
-	protected:
-		LLAtomicBase<status_t> mStatus;
-		U32 mFlags;
-	};
-
-	//------------------------------------------------------------------------
-	
-public:
-	static handle_t nullHandle() { return handle_t(0); }
-	
-public:
-	LLQueuedThread(const std::string& name, bool threaded = true, bool should_pause = false);
-	virtual ~LLQueuedThread();	
-	virtual void shutdown();
-	
-private:
-	// No copy constructor or copy assignment
-	LLQueuedThread(const LLQueuedThread&);
-	LLQueuedThread& operator=(const LLQueuedThread&);
-
-	virtual bool runCondition(void);
-	virtual void run(void);
-	virtual void startThread(void);
-	virtual void endThread(void);
-	virtual void threadedUpdate(void);
-
-protected:
-	handle_t generateHandle();
-	bool addRequest(QueuedRequest* req);
-	void processRequest(QueuedRequest* req);
-	void incQueue();
-
-public:
-	bool waitForResult(handle_t handle, bool auto_complete = true);
-
-	virtual size_t update(F32 max_time_ms);
-	size_t updateQueue(F32 max_time_ms);
-
-	void waitOnPending();
-	void printQueueStats();
-
-	virtual size_t getPending();
-	bool getThreaded() { return mThreaded; }
-
-	// Request accessors
-	status_t getRequestStatus(handle_t handle);
-	void abortRequest(handle_t handle, bool autocomplete);
-	void setFlags(handle_t handle, U32 flags);
-	bool completeRequest(handle_t handle);
-	// This is public for support classes like LLWorkerThread,
-	// but generally the methods above should be used.
-	QueuedRequest* getRequest(handle_t handle);
-
-	// debug (see source)
-	bool check();
-	
-protected:
-    bool mThreaded;  // if false, run on main thread and do updates during update()
-    bool mStarted;  // required when mThreaded is false to call startThread() from update()
-	LLAtomicBool mIdleThread; // request queue is empty (or we are quitting) and the thread is idle
-	
-	//typedef std::set<QueuedRequest*, queued_request_less> request_queue_t;
-	//request_queue_t mRequestQueue;
-    LL::WorkQueue mRequestQueue;
-    LL::WorkQueue::weak_t mMainQueue;
-
-	enum { REQUEST_HASH_SIZE = 512 }; // must be power of 2
-	typedef LLSimpleHash<handle_t, REQUEST_HASH_SIZE> request_hash_t;
-	request_hash_t mRequestHash;
-
-	handle_t mNextHandle;
-};
-
-#endif // LL_LLQUEUEDTHREAD_H
+/**

+ * @file llqueuedthread.h

+ * @brief

+ *

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

+#define LL_LLQUEUEDTHREAD_H

+

+#include <queue>

+#include <string>

+#include <map>

+#include <set>

+

+#include "llatomic.h"

+

+#include "llthread.h"

+#include "llsimplehash.h"

+#include "workqueue.h"

+

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

+// Note: ~LLQueuedThread is O(N) N=# of queued threads, assumed to be small

+//   It is assumed that LLQueuedThreads are rarely created/destroyed.

+

+class LL_COMMON_API LLQueuedThread : public LLThread

+{

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

+public:

+    enum status_t {

+        STATUS_EXPIRED = -1,

+        STATUS_UNKNOWN = 0,

+        STATUS_QUEUED = 1,

+        STATUS_INPROGRESS = 2,

+        STATUS_COMPLETE = 3,

+        STATUS_ABORTED = 4,

+        STATUS_DELETE = 5

+    };

+    enum flags_t {

+        FLAG_AUTO_COMPLETE = 1,

+        FLAG_AUTO_DELETE = 2, // child-class dependent

+        FLAG_ABORT = 4

+    };

+

+    typedef U32 handle_t;

+

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

+public:

+

+    class LL_COMMON_API QueuedRequest : public LLSimpleHashEntry<handle_t>

+    {

+        friend class LLQueuedThread;

+

+    protected:

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

+

+    public:

+        QueuedRequest(handle_t handle, U32 flags = 0);

+

+        status_t getStatus()

+        {

+            return mStatus;

+        }

+        U32 getFlags() const

+        {

+            return mFlags;

+        }

+

+    protected:

+        status_t setStatus(status_t newstatus)

+        {

+            status_t oldstatus = mStatus;

+            mStatus = newstatus;

+            return oldstatus;

+        }

+        void setFlags(U32 flags)

+        {

+            // NOTE: flags are |'d

+            mFlags |= flags;

+        }

+

+        virtual bool processRequest() = 0; // Return true when request has completed

+        virtual void finishRequest(bool completed); // Always called from thread after request has completed or aborted

+        virtual void deleteRequest(); // Only method to delete a request

+

+    protected:

+        LLAtomicBase<status_t> mStatus;

+        U32 mFlags;

+    };

+

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

+

+public:

+    static handle_t nullHandle() { return handle_t(0); }

+

+public:

+    LLQueuedThread(const std::string& name, bool threaded = true, bool should_pause = false);

+    virtual ~LLQueuedThread();

+    virtual void shutdown();

+

+private:

+    // No copy constructor or copy assignment

+    LLQueuedThread(const LLQueuedThread&);

+    LLQueuedThread& operator=(const LLQueuedThread&);

+

+    virtual bool runCondition(void);

+    virtual void run(void);

+    virtual void startThread(void);

+    virtual void endThread(void);

+    virtual void threadedUpdate(void);

+

+protected:

+    handle_t generateHandle();

+    bool addRequest(QueuedRequest* req);

+    void processRequest(QueuedRequest* req);

+    void incQueue();

+

+public:

+    bool waitForResult(handle_t handle, bool auto_complete = true);

+

+    virtual size_t update(F32 max_time_ms);

+    size_t updateQueue(F32 max_time_ms);

+

+    void waitOnPending();

+    void printQueueStats();

+

+    virtual size_t getPending();

+    bool getThreaded() { return mThreaded; }

+

+    // Request accessors

+    status_t getRequestStatus(handle_t handle);

+    void abortRequest(handle_t handle, bool autocomplete);

+    void setFlags(handle_t handle, U32 flags);

+    bool completeRequest(handle_t handle);

+    // This is public for support classes like LLWorkerThread,

+    // but generally the methods above should be used.

+    QueuedRequest* getRequest(handle_t handle);

+

+    // debug (see source)

+    bool check();

+

+protected:

+    bool mThreaded;  // if false, run on main thread and do updates during update()

+    bool mStarted;  // required when mThreaded is false to call startThread() from update()

+    LLAtomicBool mIdleThread; // request queue is empty (or we are quitting) and the thread is idle

+

+    //typedef std::set<QueuedRequest*, queued_request_less> request_queue_t;

+    //request_queue_t mRequestQueue;

+    LL::WorkQueue mRequestQueue;

+    LL::WorkQueue::weak_t mMainQueue;

+

+    enum { REQUEST_HASH_SIZE = 512 }; // must be power of 2

+    typedef LLSimpleHash<handle_t, REQUEST_HASH_SIZE> request_hash_t;

+    request_hash_t mRequestHash;

+

+    handle_t mNextHandle;

+};

+

+#endif // LL_LLQUEUEDTHREAD_H