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

diff --git a/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp b/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp
index 3753533f02..662a8b4feb 100644
--- a/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp
+++ b/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp
@@ -1,243 +1,243 @@
-/** 
-* @file llmenuoptionpathfindingrebakenavmesh.cpp
-* @brief Implementation of llmenuoptionpathfindingrebakenavmesh
-* @author Prep@lindenlab.com
-*
-* $LicenseInfo:firstyear=2012&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2012, 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 "llviewerprecompiledheaders.h"
-
-#include "llmenuoptionpathfindingrebakenavmesh.h"
-
-#include <boost/bind.hpp>
-#include <boost/signals2.hpp>
-
-#include "llagent.h"
-#include "llnotificationsutil.h"
-#include "llpathfindingmanager.h"
-#include "llpathfindingnavmesh.h"
-#include "llpathfindingnavmeshstatus.h"
-#include "llviewerregion.h"
-
-LLMenuOptionPathfindingRebakeNavmesh::LLMenuOptionPathfindingRebakeNavmesh() :
-	mIsInitialized(false),
-	mCanRebakeRegion(false),
-	mRebakeNavMeshMode(kRebakeNavMesh_Default),
-	mNavMeshSlot(),
-	mRegionCrossingSlot(),
-	mAgentStateSlot()
-{
-}
-
-LLMenuOptionPathfindingRebakeNavmesh::~LLMenuOptionPathfindingRebakeNavmesh() 
-{
-	if (mIsInitialized)
-	{
-		if (mRebakeNavMeshMode == kRebakeNavMesh_RequestSent)
-		{
-			LL_WARNS("navmeshRebaking") << "During destruction of the LLMenuOptionPathfindingRebakeNavmesh "
-				<< "singleton, the mode indicates that a request has been sent for which a response has yet "
-				<< "to be received.  This could contribute to a crash on exit." << LL_ENDL;
-		}
-
-		quit();
-	}
-}
-
-void LLMenuOptionPathfindingRebakeNavmesh::initialize()
-{
-	if (!mIsInitialized)
-	{
-		mIsInitialized = true;
-
-		setMode(kRebakeNavMesh_Default);
-
-		createNavMeshStatusListenerForCurrentRegion();
-
-		if ( !mRegionCrossingSlot.connected() )
-		{
-			mRegionCrossingSlot = gAgent.addRegionChangedCallback(boost::bind(&LLMenuOptionPathfindingRebakeNavmesh::handleRegionBoundaryCrossed, this));
-		}
-
-		if (!mAgentStateSlot.connected())
-		{
-			mAgentStateSlot = LLPathfindingManager::getInstance()->registerAgentStateListener(boost::bind(&LLMenuOptionPathfindingRebakeNavmesh::handleAgentState, this, _1));
-		}
-		LLPathfindingManager::getInstance()->requestGetAgentState();
-	}
-}
-
-void LLMenuOptionPathfindingRebakeNavmesh::quit()
-{
-	if (mIsInitialized)		// Quitting from the login screen leaves this uninitialized
-	{
-		if (mNavMeshSlot.connected())
-		{
-			mNavMeshSlot.disconnect();
-		}
-
-		if (mRegionCrossingSlot.connected())
-		{
-			mRegionCrossingSlot.disconnect();
-		}
-
-		if (mAgentStateSlot.connected())
-		{
-			mAgentStateSlot.disconnect();
-		}
-
-		mIsInitialized = false;
-	}
-}
-
-bool LLMenuOptionPathfindingRebakeNavmesh::canRebakeRegion() const
-{
-	if (!mIsInitialized)
-	{
-		LL_ERRS("navmeshRebaking") << "LLMenuOptionPathfindingRebakeNavmesh class has not been initialized "
-			<< "when the ability to rebake navmesh is being requested." << LL_ENDL;
-	}
-	return mCanRebakeRegion;
-}
-
-LLMenuOptionPathfindingRebakeNavmesh::ERebakeNavMeshMode LLMenuOptionPathfindingRebakeNavmesh::getMode() const
-{
-	if (!mIsInitialized)
-	{
-		LL_ERRS("navmeshRebaking") << "LLMenuOptionPathfindingRebakeNavmesh class has not been initialized "
-			<< "when the mode is being requested." << LL_ENDL;
-	}
-	return mRebakeNavMeshMode;
-}
-
-void LLMenuOptionPathfindingRebakeNavmesh::sendRequestRebakeNavmesh()
-{
-	if (!mIsInitialized)
-	{
-		LL_ERRS("navmeshRebaking") << "LLMenuOptionPathfindingRebakeNavmesh class has not been initialized "
-			<< "when the request is being made to rebake the navmesh." << LL_ENDL;
-	}
-	else
-	{
-		if (!canRebakeRegion())
-		{
-			LL_WARNS("navmeshRebaking") << "attempting to rebake navmesh when user does not have permissions "
-				<< "on this region" << LL_ENDL;
-		}
-		if (getMode() != kRebakeNavMesh_Available)
-		{
-			LL_WARNS("navmeshRebaking") << "attempting to rebake navmesh when mode is not available"
-				<< LL_ENDL;
-		}
-
-		setMode(kRebakeNavMesh_RequestSent);
-		LLPathfindingManager::getInstance()->requestRebakeNavMesh(boost::bind(&LLMenuOptionPathfindingRebakeNavmesh::handleRebakeNavMeshResponse, this, _1));
-	}
-}
-
-void LLMenuOptionPathfindingRebakeNavmesh::setMode(ERebakeNavMeshMode pRebakeNavMeshMode)
-{
-	mRebakeNavMeshMode = pRebakeNavMeshMode;
-}
-
-void LLMenuOptionPathfindingRebakeNavmesh::handleAgentState(bool pCanRebakeRegion)
-{
-	llassert(mIsInitialized);
-	mCanRebakeRegion = pCanRebakeRegion;
-}
-
-void LLMenuOptionPathfindingRebakeNavmesh::handleRebakeNavMeshResponse(bool pResponseStatus)
-{
-	llassert(mIsInitialized);
-	if (mIsInitialized)
-	{
-		if (getMode() == kRebakeNavMesh_RequestSent)
-		{
-			setMode(pResponseStatus ? kRebakeNavMesh_InProgress : kRebakeNavMesh_Default);
-		}
-
-		if (!pResponseStatus)
-		{
-			LLNotificationsUtil::add("PathfindingCannotRebakeNavmesh");
-		}
-	}
-}
-
-void LLMenuOptionPathfindingRebakeNavmesh::handleNavMeshStatus(const LLPathfindingNavMeshStatus &pNavMeshStatus)
-{
-	llassert(mIsInitialized);
-	if (mIsInitialized)
-	{
-		ERebakeNavMeshMode rebakeNavMeshMode = kRebakeNavMesh_Default;
-		if (pNavMeshStatus.isValid())
-		{
-			switch (pNavMeshStatus.getStatus())
-			{
-			case LLPathfindingNavMeshStatus::kPending :
-			case LLPathfindingNavMeshStatus::kRepending :
-				rebakeNavMeshMode = kRebakeNavMesh_Available;
-				break;
-			case LLPathfindingNavMeshStatus::kBuilding :
-				rebakeNavMeshMode = kRebakeNavMesh_InProgress;
-				break;
-			case LLPathfindingNavMeshStatus::kComplete :
-				rebakeNavMeshMode = kRebakeNavMesh_NotAvailable;
-				break;
-			default : 
-				rebakeNavMeshMode = kRebakeNavMesh_Default;
-				llassert(0);
-				break;
-			}
-		}
-
-		setMode(rebakeNavMeshMode);
-	}
-}
-
-void LLMenuOptionPathfindingRebakeNavmesh::handleRegionBoundaryCrossed()
-{
-	llassert(mIsInitialized);
-	if (mIsInitialized)
-	{
-		createNavMeshStatusListenerForCurrentRegion();
-		mCanRebakeRegion = false;
-		LLPathfindingManager::getInstance()->requestGetAgentState();
-	}
-}
-
-void LLMenuOptionPathfindingRebakeNavmesh::createNavMeshStatusListenerForCurrentRegion()
-{
-	if (mNavMeshSlot.connected())
-	{
-		mNavMeshSlot.disconnect();
-	}
-
-	LLViewerRegion *currentRegion = gAgent.getRegion();
-	if (currentRegion != NULL)
-	{
-		mNavMeshSlot = LLPathfindingManager::getInstance()->registerNavMeshListenerForRegion(currentRegion, boost::bind(&LLMenuOptionPathfindingRebakeNavmesh::handleNavMeshStatus, this, _2));
-		LLPathfindingManager::getInstance()->requestGetNavMeshForRegion(currentRegion, true);
-	}
-}
-
+/**

+* @file llmenuoptionpathfindingrebakenavmesh.cpp

+* @brief Implementation of llmenuoptionpathfindingrebakenavmesh

+* @author Prep@lindenlab.com

+*

+* $LicenseInfo:firstyear=2012&license=viewerlgpl$

+* Second Life Viewer Source Code

+* Copyright (C) 2012, 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 "llviewerprecompiledheaders.h"

+

+#include "llmenuoptionpathfindingrebakenavmesh.h"

+

+#include <boost/bind.hpp>

+#include <boost/signals2.hpp>

+

+#include "llagent.h"

+#include "llnotificationsutil.h"

+#include "llpathfindingmanager.h"

+#include "llpathfindingnavmesh.h"

+#include "llpathfindingnavmeshstatus.h"

+#include "llviewerregion.h"

+

+LLMenuOptionPathfindingRebakeNavmesh::LLMenuOptionPathfindingRebakeNavmesh() :

+    mIsInitialized(false),

+    mCanRebakeRegion(false),

+    mRebakeNavMeshMode(kRebakeNavMesh_Default),

+    mNavMeshSlot(),

+    mRegionCrossingSlot(),

+    mAgentStateSlot()

+{

+}

+

+LLMenuOptionPathfindingRebakeNavmesh::~LLMenuOptionPathfindingRebakeNavmesh()

+{

+    if (mIsInitialized)

+    {

+        if (mRebakeNavMeshMode == kRebakeNavMesh_RequestSent)

+        {

+            LL_WARNS("navmeshRebaking") << "During destruction of the LLMenuOptionPathfindingRebakeNavmesh "

+                << "singleton, the mode indicates that a request has been sent for which a response has yet "

+                << "to be received.  This could contribute to a crash on exit." << LL_ENDL;

+        }

+

+        quit();

+    }

+}

+

+void LLMenuOptionPathfindingRebakeNavmesh::initialize()

+{

+    if (!mIsInitialized)

+    {

+        mIsInitialized = true;

+

+        setMode(kRebakeNavMesh_Default);

+

+        createNavMeshStatusListenerForCurrentRegion();

+

+        if ( !mRegionCrossingSlot.connected() )

+        {

+            mRegionCrossingSlot = gAgent.addRegionChangedCallback(boost::bind(&LLMenuOptionPathfindingRebakeNavmesh::handleRegionBoundaryCrossed, this));

+        }

+

+        if (!mAgentStateSlot.connected())

+        {

+            mAgentStateSlot = LLPathfindingManager::getInstance()->registerAgentStateListener(boost::bind(&LLMenuOptionPathfindingRebakeNavmesh::handleAgentState, this, _1));

+        }

+        LLPathfindingManager::getInstance()->requestGetAgentState();

+    }

+}

+

+void LLMenuOptionPathfindingRebakeNavmesh::quit()

+{

+    if (mIsInitialized)     // Quitting from the login screen leaves this uninitialized

+    {

+        if (mNavMeshSlot.connected())

+        {

+            mNavMeshSlot.disconnect();

+        }

+

+        if (mRegionCrossingSlot.connected())

+        {

+            mRegionCrossingSlot.disconnect();

+        }

+

+        if (mAgentStateSlot.connected())

+        {

+            mAgentStateSlot.disconnect();

+        }

+

+        mIsInitialized = false;

+    }

+}

+

+bool LLMenuOptionPathfindingRebakeNavmesh::canRebakeRegion() const

+{

+    if (!mIsInitialized)

+    {

+        LL_ERRS("navmeshRebaking") << "LLMenuOptionPathfindingRebakeNavmesh class has not been initialized "

+            << "when the ability to rebake navmesh is being requested." << LL_ENDL;

+    }

+    return mCanRebakeRegion;

+}

+

+LLMenuOptionPathfindingRebakeNavmesh::ERebakeNavMeshMode LLMenuOptionPathfindingRebakeNavmesh::getMode() const

+{

+    if (!mIsInitialized)

+    {

+        LL_ERRS("navmeshRebaking") << "LLMenuOptionPathfindingRebakeNavmesh class has not been initialized "

+            << "when the mode is being requested." << LL_ENDL;

+    }

+    return mRebakeNavMeshMode;

+}

+

+void LLMenuOptionPathfindingRebakeNavmesh::sendRequestRebakeNavmesh()

+{

+    if (!mIsInitialized)

+    {

+        LL_ERRS("navmeshRebaking") << "LLMenuOptionPathfindingRebakeNavmesh class has not been initialized "

+            << "when the request is being made to rebake the navmesh." << LL_ENDL;

+    }

+    else

+    {

+        if (!canRebakeRegion())

+        {

+            LL_WARNS("navmeshRebaking") << "attempting to rebake navmesh when user does not have permissions "

+                << "on this region" << LL_ENDL;

+        }

+        if (getMode() != kRebakeNavMesh_Available)

+        {

+            LL_WARNS("navmeshRebaking") << "attempting to rebake navmesh when mode is not available"

+                << LL_ENDL;

+        }

+

+        setMode(kRebakeNavMesh_RequestSent);

+        LLPathfindingManager::getInstance()->requestRebakeNavMesh(boost::bind(&LLMenuOptionPathfindingRebakeNavmesh::handleRebakeNavMeshResponse, this, _1));

+    }

+}

+

+void LLMenuOptionPathfindingRebakeNavmesh::setMode(ERebakeNavMeshMode pRebakeNavMeshMode)

+{

+    mRebakeNavMeshMode = pRebakeNavMeshMode;

+}

+

+void LLMenuOptionPathfindingRebakeNavmesh::handleAgentState(bool pCanRebakeRegion)

+{

+    llassert(mIsInitialized);

+    mCanRebakeRegion = pCanRebakeRegion;

+}

+

+void LLMenuOptionPathfindingRebakeNavmesh::handleRebakeNavMeshResponse(bool pResponseStatus)

+{

+    llassert(mIsInitialized);

+    if (mIsInitialized)

+    {

+        if (getMode() == kRebakeNavMesh_RequestSent)

+        {

+            setMode(pResponseStatus ? kRebakeNavMesh_InProgress : kRebakeNavMesh_Default);

+        }

+

+        if (!pResponseStatus)

+        {

+            LLNotificationsUtil::add("PathfindingCannotRebakeNavmesh");

+        }

+    }

+}

+

+void LLMenuOptionPathfindingRebakeNavmesh::handleNavMeshStatus(const LLPathfindingNavMeshStatus &pNavMeshStatus)

+{

+    llassert(mIsInitialized);

+    if (mIsInitialized)

+    {

+        ERebakeNavMeshMode rebakeNavMeshMode = kRebakeNavMesh_Default;

+        if (pNavMeshStatus.isValid())

+        {

+            switch (pNavMeshStatus.getStatus())

+            {

+            case LLPathfindingNavMeshStatus::kPending :

+            case LLPathfindingNavMeshStatus::kRepending :

+                rebakeNavMeshMode = kRebakeNavMesh_Available;

+                break;

+            case LLPathfindingNavMeshStatus::kBuilding :

+                rebakeNavMeshMode = kRebakeNavMesh_InProgress;

+                break;

+            case LLPathfindingNavMeshStatus::kComplete :

+                rebakeNavMeshMode = kRebakeNavMesh_NotAvailable;

+                break;

+            default :

+                rebakeNavMeshMode = kRebakeNavMesh_Default;

+                llassert(0);

+                break;

+            }

+        }

+

+        setMode(rebakeNavMeshMode);

+    }

+}

+

+void LLMenuOptionPathfindingRebakeNavmesh::handleRegionBoundaryCrossed()

+{

+    llassert(mIsInitialized);

+    if (mIsInitialized)

+    {

+        createNavMeshStatusListenerForCurrentRegion();

+        mCanRebakeRegion = false;

+        LLPathfindingManager::getInstance()->requestGetAgentState();

+    }

+}

+

+void LLMenuOptionPathfindingRebakeNavmesh::createNavMeshStatusListenerForCurrentRegion()

+{

+    if (mNavMeshSlot.connected())

+    {

+        mNavMeshSlot.disconnect();

+    }

+

+    LLViewerRegion *currentRegion = gAgent.getRegion();

+    if (currentRegion != NULL)

+    {

+        mNavMeshSlot = LLPathfindingManager::getInstance()->registerNavMeshListenerForRegion(currentRegion, boost::bind(&LLMenuOptionPathfindingRebakeNavmesh::handleNavMeshStatus, this, _2));

+        LLPathfindingManager::getInstance()->requestGetNavMeshForRegion(currentRegion, true);

+    }

+}

+