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

diff --git a/indra/llmessage/lluseroperation.cpp b/indra/llmessage/lluseroperation.cpp
index 6b0cc63686..f7897f9754 100644
--- a/indra/llmessage/lluseroperation.cpp
+++ b/indra/llmessage/lluseroperation.cpp
@@ -1,190 +1,190 @@
-/** 
- * @file lluseroperation.cpp
- * @brief LLUserOperation class definition.
- *
- * $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$
- */
-
-#include "linden_common.h"
-
-#include "lluseroperation.h"
-
-///----------------------------------------------------------------------------
-/// Local function declarations, constants, enums, and typedefs
-///----------------------------------------------------------------------------
-
-LLUserOperationMgr* gUserOperationMgr = NULL;
-
-///----------------------------------------------------------------------------
-/// Class LLUserOperation
-///----------------------------------------------------------------------------
-
-LLUserOperation::LLUserOperation(const LLUUID& agent_id)
-:	mAgentID(agent_id),
-	mTimer(),
-	mNoExpire(false)
-{
-	mTransactionID.generate();
-}
-
-LLUserOperation::LLUserOperation(const LLUUID& agent_id,
-								 const LLUUID& transaction_id) :
-	mAgentID(agent_id),
-	mTransactionID(transaction_id),
-	mTimer(),
-	mNoExpire(false)
-{
-}
-
-// protected constructor which is used by base classes that determine
-// transaction, agent, et. after construction.
-LLUserOperation::LLUserOperation() :
-	mTimer(),
-	mNoExpire(false)
-{
-}
-
-LLUserOperation::~LLUserOperation()
-{
-}
-
-void LLUserOperation::SetNoExpireFlag(const bool flag)
-{
-	mNoExpire = flag;
-}
-
-bool LLUserOperation::isExpired()
-{
-	if (!mNoExpire)
-	{
-		const F32 EXPIRE_TIME_SECS = 10.f;
-		return mTimer.getElapsedTimeF32() > EXPIRE_TIME_SECS;
-	}
-	return false;
-}
-
-void LLUserOperation::expire()
-{
-	// by default, do do anything.
-}
-
-///----------------------------------------------------------------------------
-/// Class LLUserOperationMgr
-///----------------------------------------------------------------------------
-
-LLUserOperationMgr::LLUserOperationMgr()
-{
-}
-
-
-LLUserOperationMgr::~LLUserOperationMgr()
-{
-	if (mUserOperationList.size() > 0)
-	{
-		LL_WARNS() << "Exiting with user operations pending." << LL_ENDL;
-	}
-}
-
-
-void LLUserOperationMgr::addOperation(LLUserOperation* op)
-{
-	if(!op)
-	{
-		LL_WARNS() << "Tried to add null op" << LL_ENDL;
-		return;
-	}
-	LLUUID id = op->getTransactionID();
-	llassert(mUserOperationList.count(id) == 0);
-	mUserOperationList[id] = op;
-}
-
-
-LLUserOperation* LLUserOperationMgr::findOperation(const LLUUID& tid)
-{
-	user_operation_list_t::iterator iter = mUserOperationList.find(tid);
-	if (iter != mUserOperationList.end())
-		return iter->second;
-	else
-		return NULL;
-}
-
-
-bool LLUserOperationMgr::deleteOperation(LLUserOperation* op)
-{
-	size_t rv = 0;
-	if(op)
-	{
-		LLUUID id = op->getTransactionID();
-		rv = mUserOperationList.erase(id);
-		delete op;
-		op = NULL;
-	}
-	return rv != 0;
-}
-
-void LLUserOperationMgr::deleteExpiredOperations()
-{
-	const S32 MAX_OPS_CONSIDERED = 2000;
-	S32 ops_left = MAX_OPS_CONSIDERED;
-	LLUserOperation* op = NULL;
-	user_operation_list_t::iterator it;
-	if(mLastOperationConsidered.isNull())
-	{
-		it = mUserOperationList.begin();
-	}
-	else
-	{
-		it = mUserOperationList.lower_bound(mLastOperationConsidered);
-	}
-	while((ops_left--) && (it != mUserOperationList.end()))
-	{
-		op = (*it).second;
-		if(op && op->isExpired())
-		{
-			LL_DEBUGS() << "expiring: " << (*it).first << LL_ENDL;
-			op->expire();
-			mUserOperationList.erase(it++);
-			delete op;
-		}
-		else if(op)
-		{
-			++it;
-		}
-		else
-		{
-			mUserOperationList.erase(it++);
-		}
-	}
-	if(it != mUserOperationList.end())
-	{
-		mLastOperationConsidered = (*it).first;
-	}
-	else
-	{
-		mLastOperationConsidered.setNull();
-	}
-}
-
-
-///----------------------------------------------------------------------------
-/// Local function definitions
-///----------------------------------------------------------------------------
+/**

+ * @file lluseroperation.cpp

+ * @brief LLUserOperation class definition.

+ *

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

+ */

+

+#include "linden_common.h"

+

+#include "lluseroperation.h"

+

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

+/// Local function declarations, constants, enums, and typedefs

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

+

+LLUserOperationMgr* gUserOperationMgr = NULL;

+

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

+/// Class LLUserOperation

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

+

+LLUserOperation::LLUserOperation(const LLUUID& agent_id)

+:   mAgentID(agent_id),

+    mTimer(),

+    mNoExpire(false)

+{

+    mTransactionID.generate();

+}

+

+LLUserOperation::LLUserOperation(const LLUUID& agent_id,

+                                 const LLUUID& transaction_id) :

+    mAgentID(agent_id),

+    mTransactionID(transaction_id),

+    mTimer(),

+    mNoExpire(false)

+{

+}

+

+// protected constructor which is used by base classes that determine

+// transaction, agent, et. after construction.

+LLUserOperation::LLUserOperation() :

+    mTimer(),

+    mNoExpire(false)

+{

+}

+

+LLUserOperation::~LLUserOperation()

+{

+}

+

+void LLUserOperation::SetNoExpireFlag(const bool flag)

+{

+    mNoExpire = flag;

+}

+

+bool LLUserOperation::isExpired()

+{

+    if (!mNoExpire)

+    {

+        const F32 EXPIRE_TIME_SECS = 10.f;

+        return mTimer.getElapsedTimeF32() > EXPIRE_TIME_SECS;

+    }

+    return false;

+}

+

+void LLUserOperation::expire()

+{

+    // by default, do do anything.

+}

+

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

+/// Class LLUserOperationMgr

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

+

+LLUserOperationMgr::LLUserOperationMgr()

+{

+}

+

+

+LLUserOperationMgr::~LLUserOperationMgr()

+{

+    if (mUserOperationList.size() > 0)

+    {

+        LL_WARNS() << "Exiting with user operations pending." << LL_ENDL;

+    }

+}

+

+

+void LLUserOperationMgr::addOperation(LLUserOperation* op)

+{

+    if(!op)

+    {

+        LL_WARNS() << "Tried to add null op" << LL_ENDL;

+        return;

+    }

+    LLUUID id = op->getTransactionID();

+    llassert(mUserOperationList.count(id) == 0);

+    mUserOperationList[id] = op;

+}

+

+

+LLUserOperation* LLUserOperationMgr::findOperation(const LLUUID& tid)

+{

+    user_operation_list_t::iterator iter = mUserOperationList.find(tid);

+    if (iter != mUserOperationList.end())

+        return iter->second;

+    else

+        return NULL;

+}

+

+

+bool LLUserOperationMgr::deleteOperation(LLUserOperation* op)

+{

+    size_t rv = 0;

+    if(op)

+    {

+        LLUUID id = op->getTransactionID();

+        rv = mUserOperationList.erase(id);

+        delete op;

+        op = NULL;

+    }

+    return rv != 0;

+}

+

+void LLUserOperationMgr::deleteExpiredOperations()

+{

+    const S32 MAX_OPS_CONSIDERED = 2000;

+    S32 ops_left = MAX_OPS_CONSIDERED;

+    LLUserOperation* op = NULL;

+    user_operation_list_t::iterator it;

+    if(mLastOperationConsidered.isNull())

+    {

+        it = mUserOperationList.begin();

+    }

+    else

+    {

+        it = mUserOperationList.lower_bound(mLastOperationConsidered);

+    }

+    while((ops_left--) && (it != mUserOperationList.end()))

+    {

+        op = (*it).second;

+        if(op && op->isExpired())

+        {

+            LL_DEBUGS() << "expiring: " << (*it).first << LL_ENDL;

+            op->expire();

+            mUserOperationList.erase(it++);

+            delete op;

+        }

+        else if(op)

+        {

+            ++it;

+        }

+        else

+        {

+            mUserOperationList.erase(it++);

+        }

+    }

+    if(it != mUserOperationList.end())

+    {

+        mLastOperationConsidered = (*it).first;

+    }

+    else

+    {

+        mLastOperationConsidered.setNull();

+    }

+}

+

+

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

+/// Local function definitions

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