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

diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index 7d557a73b5..7b8d9c820b 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -1,220 +1,220 @@
-/** 
-* @file   llfloaterpathfindingconsole.h
-* @brief  "Pathfinding console" floater, allowing for viewing and testing of the pathfinding navmesh through Havok AI utilities.
-* @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_LLFLOATERPATHFINDINGCONSOLE_H
-#define LL_LLFLOATERPATHFINDINGCONSOLE_H
-
-#include <vector>
-
-#include <boost/signals2.hpp>
-
-#include "llfloater.h"
-#include "llhandle.h"
-#include "llpathfindingnavmeshzone.h"
-#include "llpathfindingpathtool.h"
-#include "llpathinglib.h"
-#include "v4color.h"
-
-class LLButton;
-class LLCheckBoxCtrl;
-class LLComboBox;
-class LLControlVariable;
-class LLPanel;
-class LLSD;
-class LLSliderCtrl;
-class LLTabContainer;
-class LLTextBase;
-class LLToolset;
-
-class LLFloaterPathfindingConsole
-:	public LLFloater
-{
-	friend class LLFloaterReg;
-
-public:
-	virtual bool postBuild();
-	virtual void onOpen(const LLSD& pKey);
-	virtual void onClose(bool pIsAppQuitting);
-
-	static LLHandle<LLFloaterPathfindingConsole> getInstanceHandle();
-
-	bool isRenderNavMesh() const;
-	void setRenderNavMesh(bool pIsRenderNavMesh);
-
-	bool isRenderWalkables() const;
-	void setRenderWalkables(bool pIsRenderWalkables);
-
-	bool isRenderStaticObstacles() const;
-	void setRenderStaticObstacles(bool pIsRenderStaticObstacles);
-
-	bool isRenderMaterialVolumes() const;
-	void setRenderMaterialVolumes(bool pIsRenderMaterialVolumes);
-
-	bool isRenderExclusionVolumes() const;
-	void setRenderExclusionVolumes(bool pIsRenderExclusionVolumes);
-
-	bool isRenderWorld() const;
-	void setRenderWorld(bool pIsRenderWorld);
-	
-	bool isRenderWorldMovablesOnly() const;
-	void setRenderWorldMovablesOnly(bool pIsRenderWorldMovablesOnly);
-
-	bool isRenderWaterPlane() const;
-	void setRenderWaterPlane(bool pIsRenderWaterPlane);
-	
-	bool isRenderXRay() const;
-	void setRenderXRay(bool pIsRenderXRay);
-	
-	bool isRenderAnyShapes() const;
-	U32  getRenderShapeFlags();
-
-	LLPathingLib::LLPLCharacterType getRenderHeatmapType() const;
-	void                            setRenderHeatmapType(LLPathingLib::LLPLCharacterType pRenderHeatmapType);
-	void onRegionBoundaryCross();
-protected:
-
-private:
-	typedef enum
-	{
-		kConsoleStateUnknown,
-		kConsoleStateLibraryNotImplemented,
-		kConsoleStateRegionNotEnabled,
-		kConsoleStateRegionLoading,
-		kConsoleStateCheckingVersion,
-		kConsoleStateDownloading,
-		kConsoleStateHasNavMesh,
-		kConsoleStateError
-	} EConsoleState;
-
-	// Does its own instance management, so clients not allowed
-	// to allocate or destroy.
-	LLFloaterPathfindingConsole(const LLSD& pSeed);
-	virtual ~LLFloaterPathfindingConsole();
-
-	void onTabSwitch();
-	void onShowWorldSet();
-	void onShowWorldMovablesOnlySet();
-	void onShowNavMeshSet();
-	void onShowWalkabilitySet();
-	void onCharacterWidthSet();
-	void onCharacterTypeSwitch();
-	void onClearPathClicked();
-
-	void handleNavMeshZoneStatus(LLPathfindingNavMeshZone::ENavMeshZoneRequestStatus pNavMeshZoneRequestStatus);
-	
-	void onPathEvent();
-
-	void setDefaultInputs();
-	void setConsoleState(EConsoleState pConsoleState);
-	void setWorldRenderState();
-	void setNavMeshRenderState();
-	void updateRenderablesObjects();
-
-	void updateControlsOnConsoleState();
-	void updateViewerStatusOnConsoleState();
-	void updateSimulatorStatusOnConsoleState();
-
-	void initializeNavMeshZoneForCurrentRegion();
-
-	void switchIntoTestPathMode();
-	void switchOutOfTestPathMode();
-	void updateCharacterWidth();
-	void updateCharacterType();
-	void clearPath();
-	void updatePathTestStatus();
-
-	void registerSavedSettingsListeners();
-	void deregisterSavedSettingsListeners();
-	void handleRetrieveNeighborChange(LLControlVariable *pControl, const LLSD &pNewValue);
-	void handleNavMeshColorChange(LLControlVariable *pControl, const LLSD &pNewValue);
-	void fillInColorsForNavMeshVisualization();
-	void cleanupRenderableRestoreItems();
-
-	LLRootHandle<LLFloaterPathfindingConsole>     mSelfHandle;
-	LLTabContainer                                *mViewTestTabContainer;
-	LLPanel                                       *mViewTab;
-	LLTextBase                                    *mShowLabel;
-	LLCheckBoxCtrl                                *mShowWorldCheckBox;
-	LLCheckBoxCtrl                                *mShowWorldMovablesOnlyCheckBox;
-	LLCheckBoxCtrl                                *mShowNavMeshCheckBox;
-	LLTextBase                                    *mShowNavMeshWalkabilityLabel;
-	LLComboBox                                    *mShowNavMeshWalkabilityComboBox;
-	LLCheckBoxCtrl                                *mShowWalkablesCheckBox;
-	LLCheckBoxCtrl                                *mShowStaticObstaclesCheckBox;
-	LLCheckBoxCtrl                                *mShowMaterialVolumesCheckBox;
-	LLCheckBoxCtrl                                *mShowExclusionVolumesCheckBox;
-	LLCheckBoxCtrl								  *mShowRenderWaterPlaneCheckBox;
-	LLCheckBoxCtrl								  *mShowXRayCheckBox;
-	LLTextBase                                    *mPathfindingViewerStatus;
-	LLTextBase                                    *mPathfindingSimulatorStatus;
-	LLPanel                                       *mTestTab;
-	LLTextBase                                    *mCtrlClickLabel;
-	LLTextBase                                    *mShiftClickLabel;
-	LLTextBase                                    *mCharacterWidthLabel;
-	LLTextBase                                    *mCharacterWidthUnitLabel;
-	LLSliderCtrl                                  *mCharacterWidthSlider;
-	LLTextBase                                    *mCharacterTypeLabel;
-	LLComboBox                                    *mCharacterTypeComboBox;
-	LLTextBase                                    *mPathTestingStatus;
-	LLButton                                      *mClearPathButton;
-
-	LLColor4                                      mErrorColor;
-	LLColor4                                      mWarningColor;
-
-	LLPathfindingNavMeshZone::navmesh_zone_slot_t mNavMeshZoneSlot;
-	LLPathfindingNavMeshZone                      mNavMeshZone;
-	bool                                          mIsNavMeshUpdating;
-
-	boost::signals2::connection                   mRegionBoundarySlot;
-	boost::signals2::connection                   mTeleportFailedSlot;
-	LLPathfindingPathTool::path_event_slot_t      mPathEventSlot;
-
-	LLToolset                                     *mPathfindingToolset;
-	LLToolset                                     *mSavedToolset;
-
-	boost::signals2::connection                   mSavedSettingRetrieveNeighborSlot;
-	boost::signals2::connection                   mSavedSettingWalkableSlot;
-	boost::signals2::connection                   mSavedSettingStaticObstacleSlot;
-	boost::signals2::connection                   mSavedSettingMaterialVolumeSlot;
-	boost::signals2::connection                   mSavedSettingExclusionVolumeSlot;
-	boost::signals2::connection                   mSavedSettingInteriorEdgeSlot;
-	boost::signals2::connection                   mSavedSettingExteriorEdgeSlot;
-	boost::signals2::connection                   mSavedSettingHeatmapMinSlot;
-	boost::signals2::connection                   mSavedSettingHeatmapMaxSlot;
-	boost::signals2::connection                   mSavedSettingNavMeshFaceSlot;
-	boost::signals2::connection                   mSavedSettingTestPathValidEndSlot;
-	boost::signals2::connection                   mSavedSettingTestPathInvalidEndSlot;
-	boost::signals2::connection                   mSavedSettingTestPathSlot;
-	boost::signals2::connection                   mSavedSettingWaterSlot;
-
-	EConsoleState                                 mConsoleState;
- 
-	std::vector<U32>							  mRenderableRestoreList;
-
-	static LLHandle<LLFloaterPathfindingConsole>  sInstanceHandle;
-};
-
-#endif // LL_LLFLOATERPATHFINDINGCONSOLE_H
+/**

+* @file   llfloaterpathfindingconsole.h

+* @brief  "Pathfinding console" floater, allowing for viewing and testing of the pathfinding navmesh through Havok AI utilities.

+* @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_LLFLOATERPATHFINDINGCONSOLE_H

+#define LL_LLFLOATERPATHFINDINGCONSOLE_H

+

+#include <vector>

+

+#include <boost/signals2.hpp>

+

+#include "llfloater.h"

+#include "llhandle.h"

+#include "llpathfindingnavmeshzone.h"

+#include "llpathfindingpathtool.h"

+#include "llpathinglib.h"

+#include "v4color.h"

+

+class LLButton;

+class LLCheckBoxCtrl;

+class LLComboBox;

+class LLControlVariable;

+class LLPanel;

+class LLSD;

+class LLSliderCtrl;

+class LLTabContainer;

+class LLTextBase;

+class LLToolset;

+

+class LLFloaterPathfindingConsole

+:   public LLFloater

+{

+    friend class LLFloaterReg;

+

+public:

+    virtual bool postBuild();

+    virtual void onOpen(const LLSD& pKey);

+    virtual void onClose(bool pIsAppQuitting);

+

+    static LLHandle<LLFloaterPathfindingConsole> getInstanceHandle();

+

+    bool isRenderNavMesh() const;

+    void setRenderNavMesh(bool pIsRenderNavMesh);

+

+    bool isRenderWalkables() const;

+    void setRenderWalkables(bool pIsRenderWalkables);

+

+    bool isRenderStaticObstacles() const;

+    void setRenderStaticObstacles(bool pIsRenderStaticObstacles);

+

+    bool isRenderMaterialVolumes() const;

+    void setRenderMaterialVolumes(bool pIsRenderMaterialVolumes);

+

+    bool isRenderExclusionVolumes() const;

+    void setRenderExclusionVolumes(bool pIsRenderExclusionVolumes);

+

+    bool isRenderWorld() const;

+    void setRenderWorld(bool pIsRenderWorld);

+

+    bool isRenderWorldMovablesOnly() const;

+    void setRenderWorldMovablesOnly(bool pIsRenderWorldMovablesOnly);

+

+    bool isRenderWaterPlane() const;

+    void setRenderWaterPlane(bool pIsRenderWaterPlane);

+

+    bool isRenderXRay() const;

+    void setRenderXRay(bool pIsRenderXRay);

+

+    bool isRenderAnyShapes() const;

+    U32  getRenderShapeFlags();

+

+    LLPathingLib::LLPLCharacterType getRenderHeatmapType() const;

+    void                            setRenderHeatmapType(LLPathingLib::LLPLCharacterType pRenderHeatmapType);

+    void onRegionBoundaryCross();

+protected:

+

+private:

+    typedef enum

+    {

+        kConsoleStateUnknown,

+        kConsoleStateLibraryNotImplemented,

+        kConsoleStateRegionNotEnabled,

+        kConsoleStateRegionLoading,

+        kConsoleStateCheckingVersion,

+        kConsoleStateDownloading,

+        kConsoleStateHasNavMesh,

+        kConsoleStateError

+    } EConsoleState;

+

+    // Does its own instance management, so clients not allowed

+    // to allocate or destroy.

+    LLFloaterPathfindingConsole(const LLSD& pSeed);

+    virtual ~LLFloaterPathfindingConsole();

+

+    void onTabSwitch();

+    void onShowWorldSet();

+    void onShowWorldMovablesOnlySet();

+    void onShowNavMeshSet();

+    void onShowWalkabilitySet();

+    void onCharacterWidthSet();

+    void onCharacterTypeSwitch();

+    void onClearPathClicked();

+

+    void handleNavMeshZoneStatus(LLPathfindingNavMeshZone::ENavMeshZoneRequestStatus pNavMeshZoneRequestStatus);

+

+    void onPathEvent();

+

+    void setDefaultInputs();

+    void setConsoleState(EConsoleState pConsoleState);

+    void setWorldRenderState();

+    void setNavMeshRenderState();

+    void updateRenderablesObjects();

+

+    void updateControlsOnConsoleState();

+    void updateViewerStatusOnConsoleState();

+    void updateSimulatorStatusOnConsoleState();

+

+    void initializeNavMeshZoneForCurrentRegion();

+

+    void switchIntoTestPathMode();

+    void switchOutOfTestPathMode();

+    void updateCharacterWidth();

+    void updateCharacterType();

+    void clearPath();

+    void updatePathTestStatus();

+

+    void registerSavedSettingsListeners();

+    void deregisterSavedSettingsListeners();

+    void handleRetrieveNeighborChange(LLControlVariable *pControl, const LLSD &pNewValue);

+    void handleNavMeshColorChange(LLControlVariable *pControl, const LLSD &pNewValue);

+    void fillInColorsForNavMeshVisualization();

+    void cleanupRenderableRestoreItems();

+

+    LLRootHandle<LLFloaterPathfindingConsole>     mSelfHandle;

+    LLTabContainer                                *mViewTestTabContainer;

+    LLPanel                                       *mViewTab;

+    LLTextBase                                    *mShowLabel;

+    LLCheckBoxCtrl                                *mShowWorldCheckBox;

+    LLCheckBoxCtrl                                *mShowWorldMovablesOnlyCheckBox;

+    LLCheckBoxCtrl                                *mShowNavMeshCheckBox;

+    LLTextBase                                    *mShowNavMeshWalkabilityLabel;

+    LLComboBox                                    *mShowNavMeshWalkabilityComboBox;

+    LLCheckBoxCtrl                                *mShowWalkablesCheckBox;

+    LLCheckBoxCtrl                                *mShowStaticObstaclesCheckBox;

+    LLCheckBoxCtrl                                *mShowMaterialVolumesCheckBox;

+    LLCheckBoxCtrl                                *mShowExclusionVolumesCheckBox;

+    LLCheckBoxCtrl                                *mShowRenderWaterPlaneCheckBox;

+    LLCheckBoxCtrl                                *mShowXRayCheckBox;

+    LLTextBase                                    *mPathfindingViewerStatus;

+    LLTextBase                                    *mPathfindingSimulatorStatus;

+    LLPanel                                       *mTestTab;

+    LLTextBase                                    *mCtrlClickLabel;

+    LLTextBase                                    *mShiftClickLabel;

+    LLTextBase                                    *mCharacterWidthLabel;

+    LLTextBase                                    *mCharacterWidthUnitLabel;

+    LLSliderCtrl                                  *mCharacterWidthSlider;

+    LLTextBase                                    *mCharacterTypeLabel;

+    LLComboBox                                    *mCharacterTypeComboBox;

+    LLTextBase                                    *mPathTestingStatus;

+    LLButton                                      *mClearPathButton;

+

+    LLColor4                                      mErrorColor;

+    LLColor4                                      mWarningColor;

+

+    LLPathfindingNavMeshZone::navmesh_zone_slot_t mNavMeshZoneSlot;

+    LLPathfindingNavMeshZone                      mNavMeshZone;

+    bool                                          mIsNavMeshUpdating;

+

+    boost::signals2::connection                   mRegionBoundarySlot;

+    boost::signals2::connection                   mTeleportFailedSlot;

+    LLPathfindingPathTool::path_event_slot_t      mPathEventSlot;

+

+    LLToolset                                     *mPathfindingToolset;

+    LLToolset                                     *mSavedToolset;

+

+    boost::signals2::connection                   mSavedSettingRetrieveNeighborSlot;

+    boost::signals2::connection                   mSavedSettingWalkableSlot;

+    boost::signals2::connection                   mSavedSettingStaticObstacleSlot;

+    boost::signals2::connection                   mSavedSettingMaterialVolumeSlot;

+    boost::signals2::connection                   mSavedSettingExclusionVolumeSlot;

+    boost::signals2::connection                   mSavedSettingInteriorEdgeSlot;

+    boost::signals2::connection                   mSavedSettingExteriorEdgeSlot;

+    boost::signals2::connection                   mSavedSettingHeatmapMinSlot;

+    boost::signals2::connection                   mSavedSettingHeatmapMaxSlot;

+    boost::signals2::connection                   mSavedSettingNavMeshFaceSlot;

+    boost::signals2::connection                   mSavedSettingTestPathValidEndSlot;

+    boost::signals2::connection                   mSavedSettingTestPathInvalidEndSlot;

+    boost::signals2::connection                   mSavedSettingTestPathSlot;

+    boost::signals2::connection                   mSavedSettingWaterSlot;

+

+    EConsoleState                                 mConsoleState;

+

+    std::vector<U32>                              mRenderableRestoreList;

+

+    static LLHandle<LLFloaterPathfindingConsole>  sInstanceHandle;

+};

+

+#endif // LL_LLFLOATERPATHFINDINGCONSOLE_H