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

diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h
index 4095d05f36..4adf780268 100644
--- a/indra/newview/llpathfindingobject.h
+++ b/indra/newview/llpathfindingobject.h
@@ -1,92 +1,92 @@
-/** 
-* @file   llpathfindingobject.h
-* @brief  Header file for llpathfindingobject
-* @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_LLPATHFINDINGOBJECT_H
-#define LL_LLPATHFINDINGOBJECT_H
-
-#include <string>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
-
-#include "llavatarname.h"
-#include "llavatarnamecache.h"
-#include "lluuid.h"
-#include "v3math.h"
-
-class LLPathfindingObject;
-class LLSD;
-
-typedef std::shared_ptr<LLPathfindingObject> LLPathfindingObjectPtr;
-
-class LLPathfindingObject
-{
-public:
-	LLPathfindingObject();
-	LLPathfindingObject(const std::string &pUUID, const LLSD &pObjectData);
-	LLPathfindingObject(const LLPathfindingObject& pOther);
-	virtual ~LLPathfindingObject();
-
-	LLPathfindingObject& operator =(const LLPathfindingObject& pOther);
-
-	inline const LLUUID&      getUUID() const        {return mUUID;};
-	inline const std::string& getName() const        {return mName;};
-	inline const std::string& getDescription() const {return mDescription;};
-	inline bool               hasOwner() const       {return mOwnerUUID.notNull();};
-	inline bool               hasOwnerName() const   {return mHasOwnerName;};
-	std::string               getOwnerName() const;
-	inline bool               isGroupOwned() const   {return mIsGroupOwned;};
-	inline const LLVector3&   getLocation() const    {return mLocation;};
-
-	typedef boost::function<void (const LLPathfindingObject *)>         name_callback_t;
-	typedef boost::signals2::signal<void (const LLPathfindingObject *)> name_signal_t;
-	typedef boost::signals2::connection                                 name_connection_t;
-
-	name_connection_t registerOwnerNameListener(name_callback_t pOwnerNameCallback);
-
-protected:
-
-private:
-	void parseObjectData(const LLSD &pObjectData);
-
-	void fetchOwnerName();
-	void handleAvatarNameFetch(const LLUUID &pOwnerUUID, const LLAvatarName &pAvatarName);
-	void disconnectAvatarNameCacheConnection();
-
-	LLUUID                                   mUUID;
-	std::string                              mName;
-	std::string                              mDescription;
-	LLUUID                                   mOwnerUUID;
-	bool                                     mHasOwnerName;
-	LLAvatarName                             mOwnerName;
-	LLAvatarNameCache::callback_connection_t mAvatarNameCacheConnection;
-	bool                                     mIsGroupOwned;
-	LLVector3                                mLocation;
-	name_signal_t                            mOwnerNameSignal;
-};
-
-#endif // LL_LLPATHFINDINGOBJECT_H
+/**

+* @file   llpathfindingobject.h

+* @brief  Header file for llpathfindingobject

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

+#define LL_LLPATHFINDINGOBJECT_H

+

+#include <string>

+

+#include <boost/shared_ptr.hpp>

+#include <boost/function.hpp>

+#include <boost/signals2.hpp>

+

+#include "llavatarname.h"

+#include "llavatarnamecache.h"

+#include "lluuid.h"

+#include "v3math.h"

+

+class LLPathfindingObject;

+class LLSD;

+

+typedef std::shared_ptr<LLPathfindingObject> LLPathfindingObjectPtr;

+

+class LLPathfindingObject

+{

+public:

+    LLPathfindingObject();

+    LLPathfindingObject(const std::string &pUUID, const LLSD &pObjectData);

+    LLPathfindingObject(const LLPathfindingObject& pOther);

+    virtual ~LLPathfindingObject();

+

+    LLPathfindingObject& operator =(const LLPathfindingObject& pOther);

+

+    inline const LLUUID&      getUUID() const        {return mUUID;};

+    inline const std::string& getName() const        {return mName;};

+    inline const std::string& getDescription() const {return mDescription;};

+    inline bool               hasOwner() const       {return mOwnerUUID.notNull();};

+    inline bool               hasOwnerName() const   {return mHasOwnerName;};

+    std::string               getOwnerName() const;

+    inline bool               isGroupOwned() const   {return mIsGroupOwned;};

+    inline const LLVector3&   getLocation() const    {return mLocation;};

+

+    typedef boost::function<void (const LLPathfindingObject *)>         name_callback_t;

+    typedef boost::signals2::signal<void (const LLPathfindingObject *)> name_signal_t;

+    typedef boost::signals2::connection                                 name_connection_t;

+

+    name_connection_t registerOwnerNameListener(name_callback_t pOwnerNameCallback);

+

+protected:

+

+private:

+    void parseObjectData(const LLSD &pObjectData);

+

+    void fetchOwnerName();

+    void handleAvatarNameFetch(const LLUUID &pOwnerUUID, const LLAvatarName &pAvatarName);

+    void disconnectAvatarNameCacheConnection();

+

+    LLUUID                                   mUUID;

+    std::string                              mName;

+    std::string                              mDescription;

+    LLUUID                                   mOwnerUUID;

+    bool                                     mHasOwnerName;

+    LLAvatarName                             mOwnerName;

+    LLAvatarNameCache::callback_connection_t mAvatarNameCacheConnection;

+    bool                                     mIsGroupOwned;

+    LLVector3                                mLocation;

+    name_signal_t                            mOwnerNameSignal;

+};

+

+#endif // LL_LLPATHFINDINGOBJECT_H