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

diff --git a/indra/newview/llfloaterpathfindingobjects.h b/indra/newview/llfloaterpathfindingobjects.h
index 6e744c9fa1..3e50d21f1d 100644
--- a/indra/newview/llfloaterpathfindingobjects.h
+++ b/indra/newview/llfloaterpathfindingobjects.h
@@ -1,179 +1,179 @@
-/** 
-* @file   llfloaterpathfindingobjects.h
-* @brief  Base class for both the pathfinding linksets and characters floater.
-* @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_LLFLOATERPATHFINDINGOBJECTS_H
-#define LL_LLFLOATERPATHFINDINGOBJECTS_H
-
-#include <string>
-#include <map>
-
-#include <boost/signals2.hpp>
-
-#include "llagent.h"
-#include "llfloater.h"
-#include "llpathfindingmanager.h"
-#include "llpathfindingobject.h"
-#include "llpathfindingobjectlist.h"
-#include "llselectmgr.h"
-#include "lluuid.h"
-#include "v4color.h"
-
-class LLAvatarName;
-class LLButton;
-class LLCheckBoxCtrl;
-class LLScrollListCtrl;
-class LLScrollListItem;
-class LLSD;
-class LLTextBase;
-
-class LLFloaterPathfindingObjects : public LLFloater
-{
-public:
-	virtual void onOpen(const LLSD &pKey);
-	virtual void onClose(bool pIsAppQuitting);
-	virtual void draw();
-
-protected:
-	friend class LLFloaterReg;
-
-	typedef enum
-	{
-		kMessagingUnknown,
-		kMessagingGetRequestSent,
-		kMessagingGetError,
-		kMessagingSetRequestSent,
-		kMessagingSetError,
-		kMessagingComplete,
-		kMessagingNotEnabled
-	} EMessagingState;
-
-	LLFloaterPathfindingObjects(const LLSD &pSeed);
-	virtual ~LLFloaterPathfindingObjects();
-
-	virtual bool                       postBuild();
-
-	virtual void                       requestGetObjects();
-	LLPathfindingManager::request_id_t getNewRequestId();
-	void                               handleNewObjectList(LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::ERequestStatus pRequestStatus, LLPathfindingObjectListPtr pObjectList);
-	void                               handleUpdateObjectList(LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::ERequestStatus pRequestStatus, LLPathfindingObjectListPtr pObjectList);
-
-	void                               rebuildObjectsScrollList(bool update_if_needed = false);
-	virtual void                       buildObjectsScrollList(const LLPathfindingObjectListPtr pObjectListPtr);
-	void                               addObjectToScrollList(const LLPathfindingObjectPtr pObjectPr, const LLSD &pScrollListItemData);
-
-	virtual void                       updateControlsOnScrollListChange();
-	virtual void                       updateControlsOnInWorldSelectionChange();
-
-	virtual S32                        getNameColumnIndex() const;
-	virtual S32                        getOwnerNameColumnIndex() const;
-	virtual std::string                getOwnerName(const LLPathfindingObject *pObject) const;
-	virtual const LLColor4             &getBeaconColor() const;
-	virtual const LLColor4             &getBeaconTextColor() const;
-	virtual S32                        getBeaconWidth() const;
-
-	void                               showFloaterWithSelectionObjects();
-
-	bool                               isShowBeacons() const;
-	void                               clearAllObjects();
-	void                               selectAllObjects();
-	void                               selectNoneObjects();
-	void                               teleportToSelectedObject();
-
-	virtual LLPathfindingObjectListPtr getEmptyObjectList() const;
-	int                                getNumSelectedObjects() const;
-	LLPathfindingObjectListPtr         getSelectedObjects() const;
-	LLPathfindingObjectPtr             getFirstSelectedObject() const;
-
-	EMessagingState                    getMessagingState() const;
-
-private:
-	LLFloaterPathfindingObjects(const LLFloaterPathfindingObjects &pOther);
-
-	void                   setMessagingState(EMessagingState pMessagingState);
-
-	void                   onRefreshObjectsClicked();
-	void                   onSelectAllObjectsClicked();
-	void                   onSelectNoneObjectsClicked();
-	void                   onTakeClicked();
-	void                   onTakeCopyClicked();
-	void                   onReturnClicked();
-	void                   onDeleteClicked();
-	void                   onTeleportClicked();
-
-	void                   onScrollListSelectionChanged();
-	void                   onInWorldSelectionListChanged();
-	void                   onRegionBoundaryCrossed();
-	void                   onGodLevelChange(U8 pGodLevel);
-
-	void                   handleObjectNameResponse(const LLPathfindingObject *pObject);
-
-	void                   updateMessagingStatus();
-	void                   updateStateOnListControls();
-	void                   updateStateOnActionControls();
-	void                   selectScrollListItemsInWorld();
-
-	void                   handleReturnItemsResponse(const LLSD &pNotification, const LLSD &pResponse);
-	void                   handleDeleteItemsResponse(const LLSD &pNotification, const LLSD &pResponse);
-
-	LLPathfindingObjectPtr findObject(const LLScrollListItem *pListItem) const;
-
-	LLScrollListCtrl                   *mObjectsScrollList;
-	LLTextBase                         *mMessagingStatus;
-	LLButton                           *mRefreshListButton;
-	LLButton                           *mSelectAllButton;
-	LLButton                           *mSelectNoneButton;
-	LLCheckBoxCtrl                     *mShowBeaconCheckBox;
-
-	LLButton                           *mTakeButton;
-	LLButton                           *mTakeCopyButton;
-	LLButton                           *mReturnButton;
-	LLButton                           *mDeleteButton;
-	LLButton                           *mTeleportButton;
-
-	LLColor4                           mDefaultBeaconColor;
-	LLColor4                           mDefaultBeaconTextColor;
-	LLColor4                           mErrorTextColor;
-	LLColor4                           mWarningTextColor;
-
-	EMessagingState                    mMessagingState;
-	LLPathfindingManager::request_id_t mMessagingRequestId;
-
-	typedef std::map<std::string, LLScrollListItem *> scroll_list_item_map;
-	scroll_list_item_map               mMissingNameObjectsScrollListItems;
-
-	LLPathfindingObjectListPtr         mObjectList;
-
-	LLObjectSelectionHandle            mObjectsSelection;
-
-	bool                               mHasObjectsToBeSelected;
-	uuid_vec_t                         mObjectsToBeSelected;
-
-	boost::signals2::connection        mSelectionUpdateSlot;
-	boost::signals2::connection        mRegionBoundaryCrossingSlot;
-	LLAgent::god_level_change_slot_t   mGodLevelChangeSlot;
-};
-
-#endif // LL_LLFLOATERPATHFINDINGOBJECTS_H
+/**

+* @file   llfloaterpathfindingobjects.h

+* @brief  Base class for both the pathfinding linksets and characters floater.

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

+#define LL_LLFLOATERPATHFINDINGOBJECTS_H

+

+#include <string>

+#include <map>

+

+#include <boost/signals2.hpp>

+

+#include "llagent.h"

+#include "llfloater.h"

+#include "llpathfindingmanager.h"

+#include "llpathfindingobject.h"

+#include "llpathfindingobjectlist.h"

+#include "llselectmgr.h"

+#include "lluuid.h"

+#include "v4color.h"

+

+class LLAvatarName;

+class LLButton;

+class LLCheckBoxCtrl;

+class LLScrollListCtrl;

+class LLScrollListItem;

+class LLSD;

+class LLTextBase;

+

+class LLFloaterPathfindingObjects : public LLFloater

+{

+public:

+    virtual void onOpen(const LLSD &pKey);

+    virtual void onClose(bool pIsAppQuitting);

+    virtual void draw();

+

+protected:

+    friend class LLFloaterReg;

+

+    typedef enum

+    {

+        kMessagingUnknown,

+        kMessagingGetRequestSent,

+        kMessagingGetError,

+        kMessagingSetRequestSent,

+        kMessagingSetError,

+        kMessagingComplete,

+        kMessagingNotEnabled

+    } EMessagingState;

+

+    LLFloaterPathfindingObjects(const LLSD &pSeed);

+    virtual ~LLFloaterPathfindingObjects();

+

+    virtual bool                       postBuild();

+

+    virtual void                       requestGetObjects();

+    LLPathfindingManager::request_id_t getNewRequestId();

+    void                               handleNewObjectList(LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::ERequestStatus pRequestStatus, LLPathfindingObjectListPtr pObjectList);

+    void                               handleUpdateObjectList(LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::ERequestStatus pRequestStatus, LLPathfindingObjectListPtr pObjectList);

+

+    void                               rebuildObjectsScrollList(bool update_if_needed = false);

+    virtual void                       buildObjectsScrollList(const LLPathfindingObjectListPtr pObjectListPtr);

+    void                               addObjectToScrollList(const LLPathfindingObjectPtr pObjectPr, const LLSD &pScrollListItemData);

+

+    virtual void                       updateControlsOnScrollListChange();

+    virtual void                       updateControlsOnInWorldSelectionChange();

+

+    virtual S32                        getNameColumnIndex() const;

+    virtual S32                        getOwnerNameColumnIndex() const;

+    virtual std::string                getOwnerName(const LLPathfindingObject *pObject) const;

+    virtual const LLColor4             &getBeaconColor() const;

+    virtual const LLColor4             &getBeaconTextColor() const;

+    virtual S32                        getBeaconWidth() const;

+

+    void                               showFloaterWithSelectionObjects();

+

+    bool                               isShowBeacons() const;

+    void                               clearAllObjects();

+    void                               selectAllObjects();

+    void                               selectNoneObjects();

+    void                               teleportToSelectedObject();

+

+    virtual LLPathfindingObjectListPtr getEmptyObjectList() const;

+    int                                getNumSelectedObjects() const;

+    LLPathfindingObjectListPtr         getSelectedObjects() const;

+    LLPathfindingObjectPtr             getFirstSelectedObject() const;

+

+    EMessagingState                    getMessagingState() const;

+

+private:

+    LLFloaterPathfindingObjects(const LLFloaterPathfindingObjects &pOther);

+

+    void                   setMessagingState(EMessagingState pMessagingState);

+

+    void                   onRefreshObjectsClicked();

+    void                   onSelectAllObjectsClicked();

+    void                   onSelectNoneObjectsClicked();

+    void                   onTakeClicked();

+    void                   onTakeCopyClicked();

+    void                   onReturnClicked();

+    void                   onDeleteClicked();

+    void                   onTeleportClicked();

+

+    void                   onScrollListSelectionChanged();

+    void                   onInWorldSelectionListChanged();

+    void                   onRegionBoundaryCrossed();

+    void                   onGodLevelChange(U8 pGodLevel);

+

+    void                   handleObjectNameResponse(const LLPathfindingObject *pObject);

+

+    void                   updateMessagingStatus();

+    void                   updateStateOnListControls();

+    void                   updateStateOnActionControls();

+    void                   selectScrollListItemsInWorld();

+

+    void                   handleReturnItemsResponse(const LLSD &pNotification, const LLSD &pResponse);

+    void                   handleDeleteItemsResponse(const LLSD &pNotification, const LLSD &pResponse);

+

+    LLPathfindingObjectPtr findObject(const LLScrollListItem *pListItem) const;

+

+    LLScrollListCtrl                   *mObjectsScrollList;

+    LLTextBase                         *mMessagingStatus;

+    LLButton                           *mRefreshListButton;

+    LLButton                           *mSelectAllButton;

+    LLButton                           *mSelectNoneButton;

+    LLCheckBoxCtrl                     *mShowBeaconCheckBox;

+

+    LLButton                           *mTakeButton;

+    LLButton                           *mTakeCopyButton;

+    LLButton                           *mReturnButton;

+    LLButton                           *mDeleteButton;

+    LLButton                           *mTeleportButton;

+

+    LLColor4                           mDefaultBeaconColor;

+    LLColor4                           mDefaultBeaconTextColor;

+    LLColor4                           mErrorTextColor;

+    LLColor4                           mWarningTextColor;

+

+    EMessagingState                    mMessagingState;

+    LLPathfindingManager::request_id_t mMessagingRequestId;

+

+    typedef std::map<std::string, LLScrollListItem *> scroll_list_item_map;

+    scroll_list_item_map               mMissingNameObjectsScrollListItems;

+

+    LLPathfindingObjectListPtr         mObjectList;

+

+    LLObjectSelectionHandle            mObjectsSelection;

+

+    bool                               mHasObjectsToBeSelected;

+    uuid_vec_t                         mObjectsToBeSelected;

+

+    boost::signals2::connection        mSelectionUpdateSlot;

+    boost::signals2::connection        mRegionBoundaryCrossingSlot;

+    LLAgent::god_level_change_slot_t   mGodLevelChangeSlot;

+};

+

+#endif // LL_LLFLOATERPATHFINDINGOBJECTS_H