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

1 files changed, 109 insertions, 109 deletions

diff --git a/indra/newview/llviewergesture.cpp b/indra/newview/llviewergesture.cpp
index f30279d1e9..2f7d4110fb 100644
--- a/indra/newview/llviewergesture.cpp
+++ b/indra/newview/llviewergesture.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llviewergesture.cpp
  * @brief LLViewerGesture class implementation
  *
  * $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$
  */
@@ -31,10 +31,10 @@
 #include "llaudioengine.h"
 #include "lldir.h"
 #include "llviewerinventory.h"
-#include "sound_ids.h"		// for testing
+#include "sound_ids.h"      // for testing
 
 #include "llfloaterreg.h"
-#include "llkeyboard.h"		// for key shortcuts for testing
+#include "llkeyboard.h"     // for key shortcuts for testing
 #include "llinventorymodel.h"
 #include "llvoavatar.h"
 #include "llxfermanager.h"
@@ -49,105 +49,105 @@ LLViewerGestureList gGestureList;
 const F32 LLViewerGesture::SOUND_VOLUME = 1.f;
 
 LLViewerGesture::LLViewerGesture()
-:	LLGesture()
+:   LLGesture()
 { }
 
 LLViewerGesture::LLViewerGesture(KEY key, MASK mask, const std::string &trigger,
-								 const LLUUID &sound_item_id, 
-								 const std::string &animation,
-								 const std::string &output_string)
-:	LLGesture(key, mask, trigger, sound_item_id, animation, output_string)
+                                 const LLUUID &sound_item_id,
+                                 const std::string &animation,
+                                 const std::string &output_string)
+:   LLGesture(key, mask, trigger, sound_item_id, animation, output_string)
 {
 }
 
 LLViewerGesture::LLViewerGesture(U8 **buffer, S32 max_size)
-:	LLGesture(buffer, max_size)
+:   LLGesture(buffer, max_size)
 {
 }
 
 LLViewerGesture::LLViewerGesture(const LLViewerGesture &rhs)
-:	LLGesture((LLGesture)rhs)
+:   LLGesture((LLGesture)rhs)
 {
 }
 
 BOOL LLViewerGesture::trigger(KEY key, MASK mask)
 {
-	if (mKey == key && mMask == mask)
-	{
-		doTrigger( TRUE );
-		return TRUE;
-	}
-	else
-	{
-		return FALSE;
-	}
+    if (mKey == key && mMask == mask)
+    {
+        doTrigger( TRUE );
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
 }
 
 
 BOOL LLViewerGesture::trigger(const std::string &trigger_string)
 {
-	// Assumes trigger_string is lowercase
-	if (mTriggerLower == trigger_string)
-	{
-		doTrigger( FALSE );
-		return TRUE;
-	}
-	else
-	{
-		return FALSE;
-	}
+    // Assumes trigger_string is lowercase
+    if (mTriggerLower == trigger_string)
+    {
+        doTrigger( FALSE );
+        return TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
 }
 
 
 // private
 void LLViewerGesture::doTrigger( BOOL send_chat )
 {
-	if (mSoundItemID != LLUUID::null)
-	{
-		LLViewerInventoryItem *item;
-		item = gInventory.getItem(mSoundItemID);
-		if (item)
-		{
-			send_sound_trigger(item->getAssetUUID(), SOUND_VOLUME);
-		}
-	}
-
-	if (!mAnimation.empty())
-	{
-		// AFK animations trigger the special "away" state, which
-		// includes agent control settings. JC
-		if (mAnimation == "enter_away_from_keyboard_state" || mAnimation == "away")
-		{
-			gAgent.setAFK();
-		}
-		else
-		{
-			LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation);
-			gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START);
-		}
-	}
-
-	if (send_chat && !mOutputString.empty())
-	{
-		// Don't play nodding animation, since that might not blend
-		// with the gesture animation.
-		(LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->
-				sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE);
-	}
+    if (mSoundItemID != LLUUID::null)
+    {
+        LLViewerInventoryItem *item;
+        item = gInventory.getItem(mSoundItemID);
+        if (item)
+        {
+            send_sound_trigger(item->getAssetUUID(), SOUND_VOLUME);
+        }
+    }
+
+    if (!mAnimation.empty())
+    {
+        // AFK animations trigger the special "away" state, which
+        // includes agent control settings. JC
+        if (mAnimation == "enter_away_from_keyboard_state" || mAnimation == "away")
+        {
+            gAgent.setAFK();
+        }
+        else
+        {
+            LLUUID anim_id = gAnimLibrary.stringToAnimState(mAnimation);
+            gAgent.sendAnimationRequest(anim_id, ANIM_REQUEST_START);
+        }
+    }
+
+    if (send_chat && !mOutputString.empty())
+    {
+        // Don't play nodding animation, since that might not blend
+        // with the gesture animation.
+        (LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->
+                sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE);
+    }
 }
 
 
 LLViewerGestureList::LLViewerGestureList()
-:	LLGestureList()
+:   LLGestureList()
 {
-	mIsLoaded = FALSE;
+    mIsLoaded = FALSE;
 }
 
 
 // helper for deserialize that creates the right LLGesture subclass
 LLGesture *LLViewerGestureList::create_gesture(U8 **buffer, S32 max_size)
 {
-	return new LLViewerGesture(buffer, max_size);
+    return new LLViewerGesture(buffer, max_size);
 }
 
 
@@ -156,51 +156,51 @@ LLGesture *LLViewerGestureList::create_gesture(U8 **buffer, S32 max_size)
 // output_str
 BOOL LLViewerGestureList::matchPrefix(const std::string& in_str, std::string* out_str)
 {
-	S32 in_len = in_str.length();
-
-	std::string in_str_lc = in_str;
-	LLStringUtil::toLower(in_str_lc);
-
-	for (S32 i = 0; i < count(); i++)
-	{
-		LLGesture* gesture = get(i);
-		const std::string &trigger = gesture->getTrigger();
-		
-		if (in_len > (S32)trigger.length())
-		{
-			// too short, bail out
-			continue;
-		}
-
-		std::string trigger_trunc = utf8str_truncate(trigger, in_len);
-		LLStringUtil::toLower(trigger_trunc);
-		if (in_str_lc == trigger_trunc)
-		{
-			*out_str = trigger;
-			return TRUE;
-		}
-	}
-	return FALSE;
+    S32 in_len = in_str.length();
+
+    std::string in_str_lc = in_str;
+    LLStringUtil::toLower(in_str_lc);
+
+    for (S32 i = 0; i < count(); i++)
+    {
+        LLGesture* gesture = get(i);
+        const std::string &trigger = gesture->getTrigger();
+
+        if (in_len > (S32)trigger.length())
+        {
+            // too short, bail out
+            continue;
+        }
+
+        std::string trigger_trunc = utf8str_truncate(trigger, in_len);
+        LLStringUtil::toLower(trigger_trunc);
+        if (in_str_lc == trigger_trunc)
+        {
+            *out_str = trigger;
+            return TRUE;
+        }
+    }
+    return FALSE;
 }
 
 
 // static
 void LLViewerGestureList::xferCallback(void *data, S32 size, void** /*user_data*/, S32 status)
 {
-	if (LL_ERR_NOERR == status)
-	{
-		U8 *buffer = (U8 *)data;
-		U8 *end = gGestureList.deserialize(buffer, size);
-
-		if (end - buffer > size)
-		{
-			LL_ERRS() << "Read off of end of array, error in serialization" << LL_ENDL;
-		}
-
-		gGestureList.mIsLoaded = TRUE;
-	}
-	else
-	{
-		LL_WARNS() << "Unable to load gesture list!" << LL_ENDL;
-	}
+    if (LL_ERR_NOERR == status)
+    {
+        U8 *buffer = (U8 *)data;
+        U8 *end = gGestureList.deserialize(buffer, size);
+
+        if (end - buffer > size)
+        {
+            LL_ERRS() << "Read off of end of array, error in serialization" << LL_ENDL;
+        }
+
+        gGestureList.mIsLoaded = TRUE;
+    }
+    else
+    {
+        LL_WARNS() << "Unable to load gesture list!" << LL_ENDL;
+    }
 }