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

diff --git a/indra/llcommon/llworkerthread.h b/indra/llcommon/llworkerthread.h
index a0fe30404d..803fff78d9 100644
--- a/indra/llcommon/llworkerthread.h
+++ b/indra/llcommon/llworkerthread.h
@@ -1,201 +1,201 @@
-/** 
- * @file llworkerthread.h
- *
- * $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_LLWORKERTHREAD_H
-#define LL_LLWORKERTHREAD_H
-
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
-#include <string>
-
-#include "llqueuedthread.h"
-#include "llatomic.h"
-#include "llmutex.h"
-
-#define USE_FRAME_CALLBACK_MANAGER 0
-
-//============================================================================
-
-class LLWorkerClass;
-
-//============================================================================
-// Note: ~LLWorkerThread is O(N) N=# of worker threads, assumed to be small
-//   It is assumed that LLWorkerThreads are rarely created/destroyed.
-
-class LL_COMMON_API LLWorkerThread : public LLQueuedThread
-{
-	friend class LLWorkerClass;
-public:
-	class WorkRequest : public LLQueuedThread::QueuedRequest
-	{
-	protected:
-		virtual ~WorkRequest(); // use deleteRequest()
-		
-	public:
-		WorkRequest(handle_t handle, LLWorkerClass* workerclass, S32 param);
-
-		S32 getParam()
-		{
-			return mParam;
-		}
-		LLWorkerClass* getWorkerClass()
-		{
-			return mWorkerClass;
-		}
-
-		/*virtual*/ bool processRequest();
-		/*virtual*/ void finishRequest(bool completed);
-		/*virtual*/ void deleteRequest();
-		
-	private:
-		LLWorkerClass* mWorkerClass;
-		S32 mParam;
-	};
-
-protected:
-	void clearDeleteList() ;
-
-private:
-	typedef std::list<LLWorkerClass*> delete_list_t;
-	delete_list_t mDeleteList;
-	LLMutex* mDeleteMutex;
-	
-public:
-	LLWorkerThread(const std::string& name, bool threaded = true, bool should_pause = false);
-	~LLWorkerThread();
-
-	/*virtual*/ size_t update(F32 max_time_ms);
-	
-	handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param);
-	
-	S32 getNumDeletes() { return (S32)mDeleteList.size(); } // debug
-
-private:
-	void deleteWorker(LLWorkerClass* workerclass); // schedule for deletion
-	
-};
-
-//============================================================================
-
-// This is a base class which any class with worker functions should derive from.
-// Example Usage:
-//  LLMyWorkerClass* foo = new LLMyWorkerClass();
-//  foo->fetchData(); // calls addWork()
-//  while(1) // main loop
-//  {
-//     if (foo->hasData()) // calls checkWork()
-//        foo->processData();
-//  }
-//
-// WorkerClasses only have one set of work functions. If they need to do multiple
-//  background tasks, use 'param' to switch amnong them.
-// Only one background task can be active at a time (per instance).
-//  i.e. don't call addWork() if haveWork() returns true
-
-class LL_COMMON_API LLWorkerClass
-{
-	friend class LLWorkerThread;
-	friend class LLWorkerThread::WorkRequest;
-
-public:
-	typedef LLWorkerThread::handle_t handle_t;
-	enum FLAGS
-	{
-		WCF_HAVE_WORK = 0x01,
-		WCF_WORKING = 0x02,
-		WCF_WORK_FINISHED = 0x10,
-		WCF_WORK_ABORTED = 0x20,
-		WCF_DELETE_REQUESTED = 0x40,
-		WCF_ABORT_REQUESTED = 0x80
-	};
-	
-public:
-	LLWorkerClass(LLWorkerThread* workerthread, const std::string& name);
-	virtual ~LLWorkerClass();
-
-	// pure virtual, called from WORKER THREAD, returns true if done
-	virtual bool doWork(S32 param)=0; // Called from WorkRequest::processRequest()
-	// virtual, called from finishRequest() after completed or aborted
-	virtual void finishWork(S32 param, bool completed); // called from finishRequest() (WORK THREAD)
-	// virtual, returns true if safe to delete the worker
-	virtual bool deleteOK(); // called from update() (WORK THREAD)
-	
-	// schedlueDelete(): schedules deletion once aborted or completed
-	void scheduleDelete();
-	
-	bool haveWork() { return getFlags(WCF_HAVE_WORK); } // may still be true if aborted
-	bool isWorking() { return getFlags(WCF_WORKING); }
-	bool wasAborted() { return getFlags(WCF_ABORT_REQUESTED); }
-
-	const std::string& getName() const { return mWorkerClassName; }
-
-protected:
-	// called from WORKER THREAD
-	void setWorking(bool working);
-	
-	// Call from doWork only to avoid eating up cpu time.
-	// Returns true if work has been aborted
-	// yields the current thread and calls mWorkerThread->checkPause()
-	bool yield();
-	
-	void setWorkerThread(LLWorkerThread* workerthread);
-
-	// addWork(): calls startWork, adds doWork() to queue
-	void addWork(S32 param);
-
-	// abortWork(): requests that work be aborted
-	void abortWork(bool autocomplete);
-	
-	// checkWork(): if doWork is complete or aborted, call endWork() and return true
-	bool checkWork(bool aborting = false);
-
-private:
-	void setFlags(U32 flags) { mWorkFlags = mWorkFlags | flags; }
-	void clearFlags(U32 flags) { mWorkFlags = mWorkFlags & ~flags; }
-	U32  getFlags() { return mWorkFlags; }
-public:
-	bool getFlags(U32 flags) { return (mWorkFlags & flags) != 0; }
-	
-private:
-	// pure virtuals
-	virtual void startWork(S32 param)=0; // called from addWork() (MAIN THREAD)
-	virtual void endWork(S32 param, bool aborted)=0; // called from doWork() (MAIN THREAD)
-	
-protected:
-	LLWorkerThread* mWorkerThread;
-	std::string mWorkerClassName;
-	handle_t mRequestHandle;
-
-private:
-	LLMutex mMutex;
-	LLAtomicU32 mWorkFlags;
-};
-
-//============================================================================
-
-
-#endif // LL_LLWORKERTHREAD_H
+/**

+ * @file llworkerthread.h

+ *

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

+#define LL_LLWORKERTHREAD_H

+

+#include <list>

+#include <map>

+#include <queue>

+#include <set>

+#include <string>

+

+#include "llqueuedthread.h"

+#include "llatomic.h"

+#include "llmutex.h"

+

+#define USE_FRAME_CALLBACK_MANAGER 0

+

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

+

+class LLWorkerClass;

+

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

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

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

+

+class LL_COMMON_API LLWorkerThread : public LLQueuedThread

+{

+    friend class LLWorkerClass;

+public:

+    class WorkRequest : public LLQueuedThread::QueuedRequest

+    {

+    protected:

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

+

+    public:

+        WorkRequest(handle_t handle, LLWorkerClass* workerclass, S32 param);

+

+        S32 getParam()

+        {

+            return mParam;

+        }

+        LLWorkerClass* getWorkerClass()

+        {

+            return mWorkerClass;

+        }

+

+        /*virtual*/ bool processRequest();

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

+        /*virtual*/ void deleteRequest();

+

+    private:

+        LLWorkerClass* mWorkerClass;

+        S32 mParam;

+    };

+

+protected:

+    void clearDeleteList() ;

+

+private:

+    typedef std::list<LLWorkerClass*> delete_list_t;

+    delete_list_t mDeleteList;

+    LLMutex* mDeleteMutex;

+

+public:

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

+    ~LLWorkerThread();

+

+    /*virtual*/ size_t update(F32 max_time_ms);

+

+    handle_t addWorkRequest(LLWorkerClass* workerclass, S32 param);

+

+    S32 getNumDeletes() { return (S32)mDeleteList.size(); } // debug

+

+private:

+    void deleteWorker(LLWorkerClass* workerclass); // schedule for deletion

+

+};

+

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

+

+// This is a base class which any class with worker functions should derive from.

+// Example Usage:

+//  LLMyWorkerClass* foo = new LLMyWorkerClass();

+//  foo->fetchData(); // calls addWork()

+//  while(1) // main loop

+//  {

+//     if (foo->hasData()) // calls checkWork()

+//        foo->processData();

+//  }

+//

+// WorkerClasses only have one set of work functions. If they need to do multiple

+//  background tasks, use 'param' to switch amnong them.

+// Only one background task can be active at a time (per instance).

+//  i.e. don't call addWork() if haveWork() returns true

+

+class LL_COMMON_API LLWorkerClass

+{

+    friend class LLWorkerThread;

+    friend class LLWorkerThread::WorkRequest;

+

+public:

+    typedef LLWorkerThread::handle_t handle_t;

+    enum FLAGS

+    {

+        WCF_HAVE_WORK = 0x01,

+        WCF_WORKING = 0x02,

+        WCF_WORK_FINISHED = 0x10,

+        WCF_WORK_ABORTED = 0x20,

+        WCF_DELETE_REQUESTED = 0x40,

+        WCF_ABORT_REQUESTED = 0x80

+    };

+

+public:

+    LLWorkerClass(LLWorkerThread* workerthread, const std::string& name);

+    virtual ~LLWorkerClass();

+

+    // pure virtual, called from WORKER THREAD, returns true if done

+    virtual bool doWork(S32 param)=0; // Called from WorkRequest::processRequest()

+    // virtual, called from finishRequest() after completed or aborted

+    virtual void finishWork(S32 param, bool completed); // called from finishRequest() (WORK THREAD)

+    // virtual, returns true if safe to delete the worker

+    virtual bool deleteOK(); // called from update() (WORK THREAD)

+

+    // schedlueDelete(): schedules deletion once aborted or completed

+    void scheduleDelete();

+

+    bool haveWork() { return getFlags(WCF_HAVE_WORK); } // may still be true if aborted

+    bool isWorking() { return getFlags(WCF_WORKING); }

+    bool wasAborted() { return getFlags(WCF_ABORT_REQUESTED); }

+

+    const std::string& getName() const { return mWorkerClassName; }

+

+protected:

+    // called from WORKER THREAD

+    void setWorking(bool working);

+

+    // Call from doWork only to avoid eating up cpu time.

+    // Returns true if work has been aborted

+    // yields the current thread and calls mWorkerThread->checkPause()

+    bool yield();

+

+    void setWorkerThread(LLWorkerThread* workerthread);

+

+    // addWork(): calls startWork, adds doWork() to queue

+    void addWork(S32 param);

+

+    // abortWork(): requests that work be aborted

+    void abortWork(bool autocomplete);

+

+    // checkWork(): if doWork is complete or aborted, call endWork() and return true

+    bool checkWork(bool aborting = false);

+

+private:

+    void setFlags(U32 flags) { mWorkFlags = mWorkFlags | flags; }

+    void clearFlags(U32 flags) { mWorkFlags = mWorkFlags & ~flags; }

+    U32  getFlags() { return mWorkFlags; }

+public:

+    bool getFlags(U32 flags) { return (mWorkFlags & flags) != 0; }

+

+private:

+    // pure virtuals

+    virtual void startWork(S32 param)=0; // called from addWork() (MAIN THREAD)

+    virtual void endWork(S32 param, bool aborted)=0; // called from doWork() (MAIN THREAD)

+

+protected:

+    LLWorkerThread* mWorkerThread;

+    std::string mWorkerClassName;

+    handle_t mRequestHandle;

+

+private:

+    LLMutex mMutex;

+    LLAtomicU32 mWorkFlags;

+};

+

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

+

+

+#endif // LL_LLWORKERTHREAD_H