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

diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp
index b609afce60..1ac2bc5b7b 100644
--- a/indra/newview/llpathfindingcharacter.cpp
+++ b/indra/newview/llpathfindingcharacter.cpp
@@ -1,99 +1,99 @@
-/** 
-* @file llpathfindingcharacter.cpp
-* @brief Definition of a pathfinding character that contains various properties required for havok pathfinding.
-* @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$
-*/
-
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llpathfindingcharacter.h"
-
-#include <string>
-
-#include "llpathfindingobject.h"
-#include "llsd.h"
-
-#define CHARACTER_CPU_TIME_FIELD   "cpu_time"
-#define CHARACTER_HORIZONTAL_FIELD "horizontal"
-#define CHARACTER_LENGTH_FIELD     "length"
-#define CHARACTER_RADIUS_FIELD     "radius"
-
-//---------------------------------------------------------------------------
-// LLPathfindingCharacter
-//---------------------------------------------------------------------------
-
-LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterData)
-	: LLPathfindingObject(pUUID, pCharacterData),
-	mCPUTime(0U),
-	mIsHorizontal(false),
-	mLength(0.0f),
-	mRadius(0.0f)
-{
-	parseCharacterData(pCharacterData);
-}
-
-LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther)
-	: LLPathfindingObject(pOther),
-	mCPUTime(pOther.mCPUTime),
-	mIsHorizontal(pOther.mIsHorizontal),
-	mLength(pOther.mLength),
-	mRadius(pOther.mRadius)
-{
-}
-
-LLPathfindingCharacter::~LLPathfindingCharacter()
-{
-}
-
-LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCharacter& pOther)
-{
-	dynamic_cast<LLPathfindingObject &>(*this) = pOther;
-
-	mCPUTime = pOther.mCPUTime;
-	mIsHorizontal = pOther.mIsHorizontal;
-	mLength = pOther.mLength;
-	mRadius = pOther.mRadius;
-
-	return *this;
-}
-
-void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData)
-{
-	llassert(pCharacterData.has(CHARACTER_CPU_TIME_FIELD));
-	llassert(pCharacterData.get(CHARACTER_CPU_TIME_FIELD).isReal());
-	mCPUTime = pCharacterData.get(CHARACTER_CPU_TIME_FIELD).asReal();
-
-	llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD));
-	llassert(pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).isBoolean());
-	mIsHorizontal = pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).asBoolean();
-
-	llassert(pCharacterData.has(CHARACTER_LENGTH_FIELD));
-	llassert(pCharacterData.get(CHARACTER_LENGTH_FIELD).isReal());
-	mLength = pCharacterData.get(CHARACTER_LENGTH_FIELD).asReal();
-
-	llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD));
-	llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal());
-	mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal();
-}
+/**

+* @file llpathfindingcharacter.cpp

+* @brief Definition of a pathfinding character that contains various properties required for havok pathfinding.

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

+*/

+

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llpathfindingcharacter.h"

+

+#include <string>

+

+#include "llpathfindingobject.h"

+#include "llsd.h"

+

+#define CHARACTER_CPU_TIME_FIELD   "cpu_time"

+#define CHARACTER_HORIZONTAL_FIELD "horizontal"

+#define CHARACTER_LENGTH_FIELD     "length"

+#define CHARACTER_RADIUS_FIELD     "radius"

+

+//---------------------------------------------------------------------------

+// LLPathfindingCharacter

+//---------------------------------------------------------------------------

+

+LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterData)

+    : LLPathfindingObject(pUUID, pCharacterData),

+    mCPUTime(0U),

+    mIsHorizontal(false),

+    mLength(0.0f),

+    mRadius(0.0f)

+{

+    parseCharacterData(pCharacterData);

+}

+

+LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther)

+    : LLPathfindingObject(pOther),

+    mCPUTime(pOther.mCPUTime),

+    mIsHorizontal(pOther.mIsHorizontal),

+    mLength(pOther.mLength),

+    mRadius(pOther.mRadius)

+{

+}

+

+LLPathfindingCharacter::~LLPathfindingCharacter()

+{

+}

+

+LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCharacter& pOther)

+{

+    dynamic_cast<LLPathfindingObject &>(*this) = pOther;

+

+    mCPUTime = pOther.mCPUTime;

+    mIsHorizontal = pOther.mIsHorizontal;

+    mLength = pOther.mLength;

+    mRadius = pOther.mRadius;

+

+    return *this;

+}

+

+void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData)

+{

+    llassert(pCharacterData.has(CHARACTER_CPU_TIME_FIELD));

+    llassert(pCharacterData.get(CHARACTER_CPU_TIME_FIELD).isReal());

+    mCPUTime = pCharacterData.get(CHARACTER_CPU_TIME_FIELD).asReal();

+

+    llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD));

+    llassert(pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).isBoolean());

+    mIsHorizontal = pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).asBoolean();

+

+    llassert(pCharacterData.has(CHARACTER_LENGTH_FIELD));

+    llassert(pCharacterData.get(CHARACTER_LENGTH_FIELD).isReal());

+    mLength = pCharacterData.get(CHARACTER_LENGTH_FIELD).asReal();

+

+    llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD));

+    llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal());

+    mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal();

+}