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

diff --git a/indra/llcharacter/llkeyframefallmotion.cpp b/indra/llcharacter/llkeyframefallmotion.cpp
index ed6dd69362..58fd99bc5c 100644
--- a/indra/llcharacter/llkeyframefallmotion.cpp
+++ b/indra/llcharacter/llkeyframefallmotion.cpp
@@ -1,150 +1,150 @@
-/** 
- * @file llkeyframefallmotion.cpp
- * @brief Implementation of LLKeyframeFallMotion class.
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, 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$
- */
-
-//-----------------------------------------------------------------------------
-// Header Files
-//-----------------------------------------------------------------------------
-#include "linden_common.h"
-
-#include "llkeyframefallmotion.h"
-#include "llcharacter.h"
-#include "m3math.h"
-
-//-----------------------------------------------------------------------------
-// Macros
-//-----------------------------------------------------------------------------
-#define GO_TO_KEY_POSE	1
-#define MIN_TRACK_SPEED 0.01f
-
-//-----------------------------------------------------------------------------
-// LLKeyframeFallMotion()
-// Class Constructor
-//-----------------------------------------------------------------------------
-LLKeyframeFallMotion::LLKeyframeFallMotion(const LLUUID &id) : LLKeyframeMotion(id)
-{
-	mVelocityZ = 0.f;
-	mCharacter = NULL;
-}
-
-
-//-----------------------------------------------------------------------------
-// ~LLKeyframeFallMotion()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLKeyframeFallMotion::~LLKeyframeFallMotion()
-{
-}
-
-
-//-----------------------------------------------------------------------------
-// LLKeyframeFallMotion::onInitialize()
-//-----------------------------------------------------------------------------
-LLMotion::LLMotionInitStatus LLKeyframeFallMotion::onInitialize(LLCharacter *character)
-{
-	// save character pointer for later use
-	mCharacter = character;
-
-	// load keyframe data, setup pose and joint states
-	LLMotion::LLMotionInitStatus result = LLKeyframeMotion::onInitialize(character);
-
-	if (result != LLMotion::STATUS_SUCCESS)
-	{
-		return result;
-	}
-
-	for (U32 jm=0; jm<mJointMotionList->getNumJointMotions(); jm++)
-	{
-		if (!mJointStates[jm]->getJoint())
-			continue;
-		if (mJointStates[jm]->getJoint()->getName() == std::string("mPelvis"))
-		{
-			mPelvisState = mJointStates[jm];
-		}
-	}
-
-	return result;
-}
-
-//-----------------------------------------------------------------------------
-// LLKeyframeFallMotion::onActivate()
-//-----------------------------------------------------------------------------
-bool LLKeyframeFallMotion::onActivate()
-{
-	LLVector3 ground_pos;
-	LLVector3 ground_normal;
-	LLQuaternion inverse_pelvis_rot;
-	LLVector3 fwd_axis(1.f, 0.f, 0.f);
-
-	mVelocityZ = -mCharacter->getCharacterVelocity().mV[VZ];
-	mCharacter->getGround( mCharacter->getCharacterPosition(), ground_pos, ground_normal);
-	ground_normal.normVec();
-
-	inverse_pelvis_rot = mCharacter->getCharacterRotation();
-	inverse_pelvis_rot.transQuat();
-
-	// find ground normal in pelvis space
-	ground_normal = ground_normal * inverse_pelvis_rot;
-
-	// calculate new foward axis
-	fwd_axis = fwd_axis - (ground_normal * (ground_normal * fwd_axis));
-	fwd_axis.normVec();
-	mRotationToGroundNormal = LLQuaternion(fwd_axis, ground_normal % fwd_axis, ground_normal);
-
-	return LLKeyframeMotion::onActivate();
-}
-
-//-----------------------------------------------------------------------------
-// LLKeyframeFallMotion::onUpdate()
-//-----------------------------------------------------------------------------
-bool LLKeyframeFallMotion::onUpdate(F32 activeTime, U8* joint_mask)
-{
-    LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
-	bool result = LLKeyframeMotion::onUpdate(activeTime, joint_mask);
-	F32  slerp_amt = clamp_rescale(activeTime / getDuration(), 0.5f, 0.75f, 0.f, 1.f);
-
-	if (mPelvisState.notNull())
-	{
-		mPelvisState->setRotation(mPelvisState->getRotation() * slerp(slerp_amt, mRotationToGroundNormal, LLQuaternion()));
-	}
-	
-	return result;
-}
-
-//-----------------------------------------------------------------------------
-// LLKeyframeFallMotion::getEaseInDuration()
-//-----------------------------------------------------------------------------
-F32 LLKeyframeFallMotion::getEaseInDuration()
-{
-	if (mVelocityZ == 0.f)
-	{
-		// we've already hit the ground
-		return 0.4f;
-	}
-
-	return mCharacter->getPreferredPelvisHeight() / mVelocityZ;
-}
-
-// End
+/**

+ * @file llkeyframefallmotion.cpp

+ * @brief Implementation of LLKeyframeFallMotion class.

+ *

+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, 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$

+ */

+

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

+// Header Files

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

+#include "linden_common.h"

+

+#include "llkeyframefallmotion.h"

+#include "llcharacter.h"

+#include "m3math.h"

+

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

+// Macros

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

+#define GO_TO_KEY_POSE  1

+#define MIN_TRACK_SPEED 0.01f

+

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

+// LLKeyframeFallMotion()

+// Class Constructor

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

+LLKeyframeFallMotion::LLKeyframeFallMotion(const LLUUID &id) : LLKeyframeMotion(id)

+{

+    mVelocityZ = 0.f;

+    mCharacter = NULL;

+}

+

+

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

+// ~LLKeyframeFallMotion()

+// Class Destructor

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

+LLKeyframeFallMotion::~LLKeyframeFallMotion()

+{

+}

+

+

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

+// LLKeyframeFallMotion::onInitialize()

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

+LLMotion::LLMotionInitStatus LLKeyframeFallMotion::onInitialize(LLCharacter *character)

+{

+    // save character pointer for later use

+    mCharacter = character;

+

+    // load keyframe data, setup pose and joint states

+    LLMotion::LLMotionInitStatus result = LLKeyframeMotion::onInitialize(character);

+

+    if (result != LLMotion::STATUS_SUCCESS)

+    {

+        return result;

+    }

+

+    for (U32 jm=0; jm<mJointMotionList->getNumJointMotions(); jm++)

+    {

+        if (!mJointStates[jm]->getJoint())

+            continue;

+        if (mJointStates[jm]->getJoint()->getName() == std::string("mPelvis"))

+        {

+            mPelvisState = mJointStates[jm];

+        }

+    }

+

+    return result;

+}

+

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

+// LLKeyframeFallMotion::onActivate()

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

+bool LLKeyframeFallMotion::onActivate()

+{

+    LLVector3 ground_pos;

+    LLVector3 ground_normal;

+    LLQuaternion inverse_pelvis_rot;

+    LLVector3 fwd_axis(1.f, 0.f, 0.f);

+

+    mVelocityZ = -mCharacter->getCharacterVelocity().mV[VZ];

+    mCharacter->getGround( mCharacter->getCharacterPosition(), ground_pos, ground_normal);

+    ground_normal.normVec();

+

+    inverse_pelvis_rot = mCharacter->getCharacterRotation();

+    inverse_pelvis_rot.transQuat();

+

+    // find ground normal in pelvis space

+    ground_normal = ground_normal * inverse_pelvis_rot;

+

+    // calculate new foward axis

+    fwd_axis = fwd_axis - (ground_normal * (ground_normal * fwd_axis));

+    fwd_axis.normVec();

+    mRotationToGroundNormal = LLQuaternion(fwd_axis, ground_normal % fwd_axis, ground_normal);

+

+    return LLKeyframeMotion::onActivate();

+}

+

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

+// LLKeyframeFallMotion::onUpdate()

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

+bool LLKeyframeFallMotion::onUpdate(F32 activeTime, U8* joint_mask)

+{

+    LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;

+    bool result = LLKeyframeMotion::onUpdate(activeTime, joint_mask);

+    F32  slerp_amt = clamp_rescale(activeTime / getDuration(), 0.5f, 0.75f, 0.f, 1.f);

+

+    if (mPelvisState.notNull())

+    {

+        mPelvisState->setRotation(mPelvisState->getRotation() * slerp(slerp_amt, mRotationToGroundNormal, LLQuaternion()));

+    }

+

+    return result;

+}

+

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

+// LLKeyframeFallMotion::getEaseInDuration()

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

+F32 LLKeyframeFallMotion::getEaseInDuration()

+{

+    if (mVelocityZ == 0.f)

+    {

+        // we've already hit the ground

+        return 0.4f;

+    }

+

+    return mCharacter->getPreferredPelvisHeight() / mVelocityZ;

+}

+

+// End