#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed

1 files changed, 57 insertions, 57 deletions

diff --git a/indra/newview/llemote.cpp b/indra/newview/llemote.cpp
index b9ef297c00..95ced2008f 100644
--- a/indra/newview/llemote.cpp
+++ b/indra/newview/llemote.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @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$
  */
@@ -44,12 +44,12 @@
 //-----------------------------------------------------------------------------
 LLEmote::LLEmote(const LLUUID &id) : LLMotion(id)
 {
-	mCharacter = NULL;
+    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;
+    //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;
 }
 
 
@@ -66,8 +66,8 @@ LLEmote::~LLEmote()
 //-----------------------------------------------------------------------------
 LLMotion::LLMotionInitStatus LLEmote::onInitialize(LLCharacter *character)
 {
-	mCharacter = character;
-	return STATUS_SUCCESS;
+    mCharacter = character;
+    return STATUS_SUCCESS;
 }
 
 
@@ -76,20 +76,20 @@ LLMotion::LLMotionInitStatus LLEmote::onInitialize(LLCharacter *character)
 //-----------------------------------------------------------------------------
 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;
+    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;
 }
 
 
@@ -98,25 +98,25 @@ BOOL LLEmote::onActivate()
 //-----------------------------------------------------------------------------
 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;
+    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;
 }
 
 
@@ -125,18 +125,18 @@ BOOL LLEmote::onUpdate(F32 time, U8* joint_mask)
 //-----------------------------------------------------------------------------
 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();
+    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();
 }