Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 49 insertions, 49 deletions

diff --git a/indra/newview/llemote.h b/indra/newview/llemote.h
index 4c516998dc..f1b9d4a18d 100644
--- a/indra/newview/llemote.h
+++ b/indra/newview/llemote.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llemote.h
  * @brief Definition 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$
  */
@@ -45,74 +45,74 @@ class LLVisualParam;
 // class LLEmote
 //-----------------------------------------------------------------------------
 class LLEmote :
-	public LLMotion
+    public LLMotion
 {
 public:
-	// Constructor
-	LLEmote(const LLUUID &id);
+    // Constructor
+    LLEmote(const LLUUID &id);
 
-	// Destructor
-	virtual ~LLEmote();
+    // Destructor
+    virtual ~LLEmote();
 
 public:
-	//-------------------------------------------------------------------------
-	// functions to support MotionController and MotionRegistry
-	//-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    // functions to support MotionController and MotionRegistry
+    //-------------------------------------------------------------------------
 
-	// static constructor
-	// all subclasses must implement such a function and register it
-	static LLMotion *create(const LLUUID &id) { return new LLEmote(id); }
+    // static constructor
+    // all subclasses must implement such a function and register it
+    static LLMotion *create(const LLUUID &id) { return new LLEmote(id); }
 
 public:
-	//-------------------------------------------------------------------------
-	// animation callbacks to be implemented by subclasses
-	//-------------------------------------------------------------------------
+    //-------------------------------------------------------------------------
+    // animation callbacks to be implemented by subclasses
+    //-------------------------------------------------------------------------
 
-	// motions must specify whether or not they loop
-	virtual BOOL getLoop() { return FALSE; }
+    // motions must specify whether or not they loop
+    virtual BOOL getLoop() { return FALSE; }
 
-	// motions must report their total duration
-	virtual F32 getDuration() { return EMOTE_MORPH_FADEIN_TIME + EMOTE_MORPH_IN_TIME + EMOTE_MORPH_FADEOUT_TIME; }
+    // motions must report their total duration
+    virtual F32 getDuration() { return EMOTE_MORPH_FADEIN_TIME + EMOTE_MORPH_IN_TIME + EMOTE_MORPH_FADEOUT_TIME; }
 
-	// motions must report their "ease in" duration
-	virtual F32 getEaseInDuration() { return EMOTE_MORPH_FADEIN_TIME; }
+    // motions must report their "ease in" duration
+    virtual F32 getEaseInDuration() { return EMOTE_MORPH_FADEIN_TIME; }
 
-	// motions must report their "ease out" duration.
-	virtual F32 getEaseOutDuration() { return EMOTE_MORPH_FADEOUT_TIME; }
+    // motions must report their "ease out" duration.
+    virtual F32 getEaseOutDuration() { return EMOTE_MORPH_FADEOUT_TIME; }
 
-	// called to determine when a motion should be activated/deactivated based on avatar pixel coverage
-	virtual F32 getMinPixelArea() { return MIN_REQUIRED_PIXEL_AREA_EMOTE; }
+    // called to determine when a motion should be activated/deactivated based on avatar pixel coverage
+    virtual F32 getMinPixelArea() { return MIN_REQUIRED_PIXEL_AREA_EMOTE; }
 
-	// motions must report their priority
-	virtual LLJoint::JointPriority getPriority() { return LLJoint::MEDIUM_PRIORITY; }
+    // motions must report their priority
+    virtual LLJoint::JointPriority getPriority() { return LLJoint::MEDIUM_PRIORITY; }
 
-	virtual LLMotionBlendType getBlendType() { return NORMAL_BLEND; }
+    virtual LLMotionBlendType getBlendType() { return NORMAL_BLEND; }
 
-	// run-time (post constructor) initialization,
-	// called after parameters have been set
-	// must return true to indicate success and be available for activation
-	virtual LLMotionInitStatus onInitialize(LLCharacter *character);
+    // run-time (post constructor) initialization,
+    // called after parameters have been set
+    // must return true to indicate success and be available for activation
+    virtual LLMotionInitStatus onInitialize(LLCharacter *character);
 
-	// called when a motion is activated
-	// must return TRUE to indicate success, or else
-	// it will be deactivated 
-	virtual BOOL onActivate();
+    // called when a motion is activated
+    // must return TRUE to indicate success, or else
+    // it will be deactivated
+    virtual BOOL onActivate();
 
-	// called per time step
-	// must return TRUE while it is active, and
-	// must return FALSE when the motion is completed.
-	virtual BOOL onUpdate(F32 time, U8* joint_mask);
+    // called per time step
+    // must return TRUE while it is active, and
+    // must return FALSE when the motion is completed.
+    virtual BOOL onUpdate(F32 time, U8* joint_mask);
 
-	// called when a motion is deactivated
-	virtual void onDeactivate();
+    // called when a motion is deactivated
+    virtual void onDeactivate();
 
-	virtual BOOL canDeprecate() { return FALSE; }
+    virtual BOOL canDeprecate() { return FALSE; }
 
 protected:
 
-	LLCharacter*		mCharacter;
+    LLCharacter*        mCharacter;
 
-	LLVisualParam*		mParam;
+    LLVisualParam*      mParam;
 };