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

diff --git a/indra/llmessage/lluseroperation.h b/indra/llmessage/lluseroperation.h
index 9d0f4d04d1..384978571c 100644
--- a/indra/llmessage/lluseroperation.h
+++ b/indra/llmessage/lluseroperation.h
@@ -1,97 +1,97 @@
-/** 
- * @file lluseroperation.h
- * @brief LLUserOperation class header file - used for message based
- * transaction. For example, L$ transactions.
- *
- * $LicenseInfo:firstyear=2002&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_LLUSEROPERATION_H
-#define LL_LLUSEROPERATION_H
-
-#include "lluuid.h"
-#include "llframetimer.h"
-
-#include <map>
-
-class LLUserOperation
-{
-public:
-	LLUserOperation(const LLUUID& agent_id);
-	LLUserOperation(const LLUUID& agent_id, const LLUUID& transaction_id);
-	virtual ~LLUserOperation();
-
-	const LLUUID& getTransactionID() const { return mTransactionID; }
-	const LLUUID& getAgentID() const { return mAgentID; }
-
-	// Operation never got necessary data, so expired	
-	virtual bool isExpired();
-
-	// ability to mark this operation as never expiring.
-	void SetNoExpireFlag(const bool flag);
-
-	// Send request to the dataserver
-	virtual void sendRequest() = 0;
-
-	// Run the operation. This will only be called in the case of an
-	// actual success or failure of the operation.
-	virtual bool execute(bool transaction_success) = 0;
-
-	// This method is called when the user op has expired, and is
-	// about to be deleted by the manager. This gives the user op the
-	// ability to nack someone when the user op is never evaluated
-	virtual void expire();
-
-protected:
-	LLUserOperation();
-	
-protected:
-	LLUUID mAgentID;
-	LLUUID mTransactionID;
-	LLFrameTimer mTimer;
-	bool   mNoExpire;			// this is used for operations that expect an answer and will wait till it gets one.
-};
-
-
-class LLUserOperationMgr
-{
-public:
-	LLUserOperationMgr();
-	~LLUserOperationMgr();
-
-	void addOperation(LLUserOperation* op);
-	LLUserOperation* findOperation(const LLUUID& transaction_id);
-	bool deleteOperation(LLUserOperation* op);
-
-	// Call this method every once in a while to clean up old
-	// transactions.
-	void deleteExpiredOperations();
-	
-private:
-	typedef std::map<LLUUID, LLUserOperation*> user_operation_list_t;
-	user_operation_list_t mUserOperationList;
-	LLUUID mLastOperationConsidered;
-};
-
-extern LLUserOperationMgr* gUserOperationMgr;
-
-#endif // LL_LLUSEROPERATION_H
+/**

+ * @file lluseroperation.h

+ * @brief LLUserOperation class header file - used for message based

+ * transaction. For example, L$ transactions.

+ *

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

+#define LL_LLUSEROPERATION_H

+

+#include "lluuid.h"

+#include "llframetimer.h"

+

+#include <map>

+

+class LLUserOperation

+{

+public:

+    LLUserOperation(const LLUUID& agent_id);

+    LLUserOperation(const LLUUID& agent_id, const LLUUID& transaction_id);

+    virtual ~LLUserOperation();

+

+    const LLUUID& getTransactionID() const { return mTransactionID; }

+    const LLUUID& getAgentID() const { return mAgentID; }

+

+    // Operation never got necessary data, so expired

+    virtual bool isExpired();

+

+    // ability to mark this operation as never expiring.

+    void SetNoExpireFlag(const bool flag);

+

+    // Send request to the dataserver

+    virtual void sendRequest() = 0;

+

+    // Run the operation. This will only be called in the case of an

+    // actual success or failure of the operation.

+    virtual bool execute(bool transaction_success) = 0;

+

+    // This method is called when the user op has expired, and is

+    // about to be deleted by the manager. This gives the user op the

+    // ability to nack someone when the user op is never evaluated

+    virtual void expire();

+

+protected:

+    LLUserOperation();

+

+protected:

+    LLUUID mAgentID;

+    LLUUID mTransactionID;

+    LLFrameTimer mTimer;

+    bool   mNoExpire;           // this is used for operations that expect an answer and will wait till it gets one.

+};

+

+

+class LLUserOperationMgr

+{

+public:

+    LLUserOperationMgr();

+    ~LLUserOperationMgr();

+

+    void addOperation(LLUserOperation* op);

+    LLUserOperation* findOperation(const LLUUID& transaction_id);

+    bool deleteOperation(LLUserOperation* op);

+

+    // Call this method every once in a while to clean up old

+    // transactions.

+    void deleteExpiredOperations();

+

+private:

+    typedef std::map<LLUUID, LLUserOperation*> user_operation_list_t;

+    user_operation_list_t mUserOperationList;

+    LLUUID mLastOperationConsidered;

+};

+

+extern LLUserOperationMgr* gUserOperationMgr;

+

+#endif // LL_LLUSEROPERATION_H