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

diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 13589b603b..a1fc74c48e 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -1,138 +1,138 @@
-/** 
-* @file   llpathfindingmanager.h
-* @brief  Header file for llpathfindingmanager
-* @author Stinson@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$
-*/
-#ifndef LL_LLPATHFINDINGMANAGER_H
-#define LL_LLPATHFINDINGMANAGER_H
-
-#include <string>
-#include <map>
-
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
-
-#include "llpathfindinglinkset.h"
-#include "llpathfindingobjectlist.h"
-#include "llpathfindingnavmesh.h"
-#include "llsingleton.h"
-#include "llcoros.h"
-#include "lleventcoro.h"
-
-class LLPathfindingNavMeshStatus;
-class LLUUID;
-class LLViewerRegion;
-
-class LinksetsResponder;
-
-class LLPathfindingManager : public LLSingleton<LLPathfindingManager>
-{
-	LLSINGLETON(LLPathfindingManager);
-	virtual ~LLPathfindingManager();
-
-	friend class LLNavMeshSimStateChangeNode;
-	friend class NavMeshStatusResponder;
-	friend class LLAgentStateChangeNode;
-	friend class AgentStateResponder;
-public:
-	typedef enum {
-		kRequestStarted,
-		kRequestCompleted,
-		kRequestNotEnabled,
-		kRequestError
-	} ERequestStatus;
-
-	void initSystem();
-	void quitSystem();
-
-	bool isPathfindingViewEnabled() const;
-	bool isPathfindingEnabledForCurrentRegion() const;
-	bool isPathfindingEnabledForRegion(LLViewerRegion *pRegion) const;
-
-	bool isAllowViewTerrainProperties() const;
-
-	LLPathfindingNavMesh::navmesh_slot_t registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback);
-	void requestGetNavMeshForRegion(LLViewerRegion *pRegion, bool pIsGetStatusOnly);
-
-	typedef U32 request_id_t;
-	typedef boost::function<void (request_id_t, ERequestStatus, LLPathfindingObjectListPtr)> object_request_callback_t;
-
-	void requestGetLinksets(request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;
-	void requestSetLinksets(request_id_t pRequestId, const LLPathfindingObjectListPtr &pLinksetListPtr, LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD, object_request_callback_t pLinksetsCallback) const;
-
-	void requestGetCharacters(request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
-
-	typedef boost::function<void (bool)>         agent_state_callback_t;
-	typedef boost::signals2::signal<void (bool)> agent_state_signal_t;
-	typedef boost::signals2::connection          agent_state_slot_t;	
-
-	agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback);
-	void requestGetAgentState();	
-
-	typedef boost::function<void (bool)> rebake_navmesh_callback_t;
-	void requestRebakeNavMesh(rebake_navmesh_callback_t pRebakeNavMeshCallback);
-
-protected:
-
-private:
-
-	typedef std::map<LLUUID, LLPathfindingNavMeshPtr> NavMeshMap;
-
-	void handleDeferredGetAgentStateForRegion(const LLUUID &pRegionUUID);
-	void handleDeferredGetNavMeshForRegion(const LLUUID &pRegionUUID, bool pIsGetStatusOnly);
-	void handleDeferredGetLinksetsForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;
-	void handleDeferredGetCharactersForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
-
-    void navMeshStatusRequestCoro(std::string url, U64 regionHandle, bool isGetStatusOnly);
-    void navAgentStateRequestCoro(std::string url);
-    void navMeshRebakeCoro(std::string url, rebake_navmesh_callback_t rebakeNavMeshCallback);
-    void linksetObjectsCoro(std::string url, std::shared_ptr<LinksetsResponder> linksetsResponsderPtr, LLSD putData) const;
-    void linksetTerrainCoro(std::string url, std::shared_ptr<LinksetsResponder> linksetsResponsderPtr, LLSD putData) const;
-    void charactersCoro(std::string url, request_id_t requestId, object_request_callback_t callback) const;
-
-	//void handleNavMeshStatusRequest(const LLPathfindingNavMeshStatus &pNavMeshStatus, LLViewerRegion *pRegion, bool pIsGetStatusOnly);
-	void handleNavMeshStatusUpdate(const LLPathfindingNavMeshStatus &pNavMeshStatus);
-
-	void handleAgentState(bool pCanRebakeRegion);
-
-	LLPathfindingNavMeshPtr getNavMeshForRegion(const LLUUID &pRegionUUID);
-	LLPathfindingNavMeshPtr getNavMeshForRegion(LLViewerRegion *pRegion);
-
-	std::string getNavMeshStatusURLForCurrentRegion() const;
-	std::string getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const;
-	std::string getRetrieveNavMeshURLForRegion(LLViewerRegion *pRegion) const;
-	std::string getRetrieveObjectLinksetsURLForCurrentRegion() const;
-    std::string getChangeObjectLinksetsURLForCurrentRegion() const;
-	std::string getTerrainLinksetsURLForCurrentRegion() const;
-	std::string getCharactersURLForCurrentRegion() const;
-	std::string	getAgentStateURLForRegion(LLViewerRegion *pRegion) const;
-	std::string getCapabilityURLForCurrentRegion(const std::string &pCapabilityName) const;
-	std::string getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const;
-	LLViewerRegion *getCurrentRegion() const;
-
-	NavMeshMap           mNavMeshMap;
-	agent_state_signal_t mAgentStateSignal;
-};
-
-#endif // LL_LLPATHFINDINGMANAGER_H
+/**

+* @file   llpathfindingmanager.h

+* @brief  Header file for llpathfindingmanager

+* @author Stinson@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$

+*/

+#ifndef LL_LLPATHFINDINGMANAGER_H

+#define LL_LLPATHFINDINGMANAGER_H

+

+#include <string>

+#include <map>

+

+#include <boost/function.hpp>

+#include <boost/signals2.hpp>

+

+#include "llpathfindinglinkset.h"

+#include "llpathfindingobjectlist.h"

+#include "llpathfindingnavmesh.h"

+#include "llsingleton.h"

+#include "llcoros.h"

+#include "lleventcoro.h"

+

+class LLPathfindingNavMeshStatus;

+class LLUUID;

+class LLViewerRegion;

+

+class LinksetsResponder;

+

+class LLPathfindingManager : public LLSingleton<LLPathfindingManager>

+{

+    LLSINGLETON(LLPathfindingManager);

+    virtual ~LLPathfindingManager();

+

+    friend class LLNavMeshSimStateChangeNode;

+    friend class NavMeshStatusResponder;

+    friend class LLAgentStateChangeNode;

+    friend class AgentStateResponder;

+public:

+    typedef enum {

+        kRequestStarted,

+        kRequestCompleted,

+        kRequestNotEnabled,

+        kRequestError

+    } ERequestStatus;

+

+    void initSystem();

+    void quitSystem();

+

+    bool isPathfindingViewEnabled() const;

+    bool isPathfindingEnabledForCurrentRegion() const;

+    bool isPathfindingEnabledForRegion(LLViewerRegion *pRegion) const;

+

+    bool isAllowViewTerrainProperties() const;

+

+    LLPathfindingNavMesh::navmesh_slot_t registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback);

+    void requestGetNavMeshForRegion(LLViewerRegion *pRegion, bool pIsGetStatusOnly);

+

+    typedef U32 request_id_t;

+    typedef boost::function<void (request_id_t, ERequestStatus, LLPathfindingObjectListPtr)> object_request_callback_t;

+

+    void requestGetLinksets(request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;

+    void requestSetLinksets(request_id_t pRequestId, const LLPathfindingObjectListPtr &pLinksetListPtr, LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD, object_request_callback_t pLinksetsCallback) const;

+

+    void requestGetCharacters(request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;

+

+    typedef boost::function<void (bool)>         agent_state_callback_t;

+    typedef boost::signals2::signal<void (bool)> agent_state_signal_t;

+    typedef boost::signals2::connection          agent_state_slot_t;

+

+    agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback);

+    void requestGetAgentState();

+

+    typedef boost::function<void (bool)> rebake_navmesh_callback_t;

+    void requestRebakeNavMesh(rebake_navmesh_callback_t pRebakeNavMeshCallback);

+

+protected:

+

+private:

+

+    typedef std::map<LLUUID, LLPathfindingNavMeshPtr> NavMeshMap;

+

+    void handleDeferredGetAgentStateForRegion(const LLUUID &pRegionUUID);

+    void handleDeferredGetNavMeshForRegion(const LLUUID &pRegionUUID, bool pIsGetStatusOnly);

+    void handleDeferredGetLinksetsForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;

+    void handleDeferredGetCharactersForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;

+

+    void navMeshStatusRequestCoro(std::string url, U64 regionHandle, bool isGetStatusOnly);

+    void navAgentStateRequestCoro(std::string url);

+    void navMeshRebakeCoro(std::string url, rebake_navmesh_callback_t rebakeNavMeshCallback);

+    void linksetObjectsCoro(std::string url, std::shared_ptr<LinksetsResponder> linksetsResponsderPtr, LLSD putData) const;

+    void linksetTerrainCoro(std::string url, std::shared_ptr<LinksetsResponder> linksetsResponsderPtr, LLSD putData) const;

+    void charactersCoro(std::string url, request_id_t requestId, object_request_callback_t callback) const;

+

+    //void handleNavMeshStatusRequest(const LLPathfindingNavMeshStatus &pNavMeshStatus, LLViewerRegion *pRegion, bool pIsGetStatusOnly);

+    void handleNavMeshStatusUpdate(const LLPathfindingNavMeshStatus &pNavMeshStatus);

+

+    void handleAgentState(bool pCanRebakeRegion);

+

+    LLPathfindingNavMeshPtr getNavMeshForRegion(const LLUUID &pRegionUUID);

+    LLPathfindingNavMeshPtr getNavMeshForRegion(LLViewerRegion *pRegion);

+

+    std::string getNavMeshStatusURLForCurrentRegion() const;

+    std::string getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const;

+    std::string getRetrieveNavMeshURLForRegion(LLViewerRegion *pRegion) const;

+    std::string getRetrieveObjectLinksetsURLForCurrentRegion() const;

+    std::string getChangeObjectLinksetsURLForCurrentRegion() const;

+    std::string getTerrainLinksetsURLForCurrentRegion() const;

+    std::string getCharactersURLForCurrentRegion() const;

+    std::string getAgentStateURLForRegion(LLViewerRegion *pRegion) const;

+    std::string getCapabilityURLForCurrentRegion(const std::string &pCapabilityName) const;

+    std::string getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const;

+    LLViewerRegion *getCurrentRegion() const;

+

+    NavMeshMap           mNavMeshMap;

+    agent_state_signal_t mAgentStateSignal;

+};

+

+#endif // LL_LLPATHFINDINGMANAGER_H