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

diff --git a/indra/newview/llemote.cpp b/indra/newview/llemote.cpp
index a051825dae..777ee43e46 100644
--- a/indra/newview/llemote.cpp
+++ b/indra/newview/llemote.cpp
@@ -1,143 +1,143 @@
-/** 
- * @file llemote.cpp
- * @brief Implementation of LLEmote class
- *
- * $LicenseInfo:firstyear=2002&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 "llviewerprecompiledheaders.h"
-
-#include "llemote.h"
-#include "llcharacter.h"
-#include "m3math.h"
-#include "llvoavatar.h"
-
-//-----------------------------------------------------------------------------
-// Constants
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// LLEmote()
-// Class Constructor
-//-----------------------------------------------------------------------------
-LLEmote::LLEmote(const LLUUID &id) : LLMotion(id)
-{
-	mCharacter = NULL;
-
-	//RN: flag face joint as highest priority for now, until we implement a proper animation track
-	mJointSignature[0][LL_FACE_JOINT_NUM] = 0xff;
-	mJointSignature[1][LL_FACE_JOINT_NUM] = 0xff;
-	mJointSignature[2][LL_FACE_JOINT_NUM] = 0xff;
-}
-
-
-//-----------------------------------------------------------------------------
-// ~LLEmote()
-// Class Destructor
-//-----------------------------------------------------------------------------
-LLEmote::~LLEmote()
-{
-}
-
-//-----------------------------------------------------------------------------
-// LLEmote::onInitialize(LLCharacter *character)
-//-----------------------------------------------------------------------------
-LLMotion::LLMotionInitStatus LLEmote::onInitialize(LLCharacter *character)
-{
-	mCharacter = character;
-	return STATUS_SUCCESS;
-}
-
-
-//-----------------------------------------------------------------------------
-// LLEmote::onActivate()
-//-----------------------------------------------------------------------------
-bool LLEmote::onActivate()
-{
-	LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" );
-	if( default_param )
-	{
-		default_param->setWeight( default_param->getMaxWeight());
-	}
-
-	mParam = mCharacter->getVisualParam(mName.c_str());
-	if (mParam)
-	{
-		mParam->setWeight(0.f);
-		mCharacter->updateVisualParams();
-	}
-	
-	return true;
-}
-
-
-//-----------------------------------------------------------------------------
-// LLEmote::onUpdate()
-//-----------------------------------------------------------------------------
-bool LLEmote::onUpdate(F32 time, U8* joint_mask)
-{
-	if( mParam )
-	{
-		F32 weight = mParam->getMinWeight() + mPose.getWeight() * (mParam->getMaxWeight() - mParam->getMinWeight());
-		mParam->setWeight(weight);
-
-		// Cross fade against the default parameter
-		LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" );
-		if( default_param )
-		{
-			F32 default_param_weight = default_param->getMinWeight() + 
-				(1.f - mPose.getWeight()) * ( default_param->getMaxWeight() - default_param->getMinWeight() );
-			
-			default_param->setWeight( default_param_weight);
-		}
-
-		mCharacter->updateVisualParams();
-	}
-
-	return true;
-}
-
-
-//-----------------------------------------------------------------------------
-// LLEmote::onDeactivate()
-//-----------------------------------------------------------------------------
-void LLEmote::onDeactivate()
-{
-	if( mParam )
-	{
-		mParam->setWeight( mParam->getDefaultWeight());
-	}
-
-	LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" );
-	if( default_param )
-	{
-		default_param->setWeight( default_param->getMaxWeight());
-	}
-
-	mCharacter->updateVisualParams();
-}
-
-
-// End
+/**

+ * @file llemote.cpp

+ * @brief Implementation of LLEmote class

+ *

+ * $LicenseInfo:firstyear=2002&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 "llviewerprecompiledheaders.h"

+

+#include "llemote.h"

+#include "llcharacter.h"

+#include "m3math.h"

+#include "llvoavatar.h"

+

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

+// Constants

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

+

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

+// LLEmote()

+// Class Constructor

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

+LLEmote::LLEmote(const LLUUID &id) : LLMotion(id)

+{

+    mCharacter = NULL;

+

+    //RN: flag face joint as highest priority for now, until we implement a proper animation track

+    mJointSignature[0][LL_FACE_JOINT_NUM] = 0xff;

+    mJointSignature[1][LL_FACE_JOINT_NUM] = 0xff;

+    mJointSignature[2][LL_FACE_JOINT_NUM] = 0xff;

+}

+

+

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

+// ~LLEmote()

+// Class Destructor

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

+LLEmote::~LLEmote()

+{

+}

+

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

+// LLEmote::onInitialize(LLCharacter *character)

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

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

+{

+    mCharacter = character;

+    return STATUS_SUCCESS;

+}

+

+

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

+// LLEmote::onActivate()

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

+bool LLEmote::onActivate()

+{

+    LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" );

+    if( default_param )

+    {

+        default_param->setWeight( default_param->getMaxWeight());

+    }

+

+    mParam = mCharacter->getVisualParam(mName.c_str());

+    if (mParam)

+    {

+        mParam->setWeight(0.f);

+        mCharacter->updateVisualParams();

+    }

+

+    return true;

+}

+

+

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

+// LLEmote::onUpdate()

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

+bool LLEmote::onUpdate(F32 time, U8* joint_mask)

+{

+    if( mParam )

+    {

+        F32 weight = mParam->getMinWeight() + mPose.getWeight() * (mParam->getMaxWeight() - mParam->getMinWeight());

+        mParam->setWeight(weight);

+

+        // Cross fade against the default parameter

+        LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" );

+        if( default_param )

+        {

+            F32 default_param_weight = default_param->getMinWeight() +

+                (1.f - mPose.getWeight()) * ( default_param->getMaxWeight() - default_param->getMinWeight() );

+

+            default_param->setWeight( default_param_weight);

+        }

+

+        mCharacter->updateVisualParams();

+    }

+

+    return true;

+}

+

+

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

+// LLEmote::onDeactivate()

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

+void LLEmote::onDeactivate()

+{

+    if( mParam )

+    {

+        mParam->setWeight( mParam->getDefaultWeight());

+    }

+

+    LLVisualParam* default_param = mCharacter->getVisualParam( "Express_Closed_Mouth" );

+    if( default_param )

+    {

+        default_param->setWeight( default_param->getMaxWeight());

+    }

+

+    mCharacter->updateVisualParams();

+}

+

+

+// End