Fix line endlings

1 files changed, 122 insertions, 122 deletions

diff --git a/indra/newview/llemote.h b/indra/newview/llemote.h
index b6fa3f8372..3c453fee7b 100644
--- a/indra/newview/llemote.h
+++ b/indra/newview/llemote.h
@@ -1,122 +1,122 @@
-/**

- * @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$

- */

-

-#ifndef LL_LLEMOTE_H

-#define LL_LLEMOTE_H

-

-//-----------------------------------------------------------------------------

-// Header files

-//-----------------------------------------------------------------------------

-#include "llmotion.h"

-#include "lltimer.h"

-

-#define MIN_REQUIRED_PIXEL_AREA_EMOTE 2000.f

-

-#define EMOTE_MORPH_FADEIN_TIME 0.3f

-#define EMOTE_MORPH_IN_TIME 1.1f

-#define EMOTE_MORPH_FADEOUT_TIME 1.4f

-

-class LLVisualParam;

-

-//-----------------------------------------------------------------------------

-// class LLEmote

-//-----------------------------------------------------------------------------

-class LLEmote :

-    public LLMotion

-{

-public:

-    // Constructor

-    LLEmote(const LLUUID &id);

-

-    // Destructor

-    virtual ~LLEmote();

-

-public:

-    //-------------------------------------------------------------------------

-    // 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); }

-

-public:

-    //-------------------------------------------------------------------------

-    // animation callbacks to be implemented by subclasses

-    //-------------------------------------------------------------------------

-

-    // 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 "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; }

-

-    // 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; }

-

-    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);

-

-    // 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 when a motion is deactivated

-    virtual void onDeactivate();

-

-    virtual bool canDeprecate() { return false; }

-

-protected:

-

-    LLCharacter*        mCharacter;

-

-    LLVisualParam*      mParam;

-};

-

-

-

-#endif // LL_LLEMOTE_H

-

-

+/**
+ * @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$
+ */
+
+#ifndef LL_LLEMOTE_H
+#define LL_LLEMOTE_H
+
+//-----------------------------------------------------------------------------
+// Header files
+//-----------------------------------------------------------------------------
+#include "llmotion.h"
+#include "lltimer.h"
+
+#define MIN_REQUIRED_PIXEL_AREA_EMOTE 2000.f
+
+#define EMOTE_MORPH_FADEIN_TIME 0.3f
+#define EMOTE_MORPH_IN_TIME 1.1f
+#define EMOTE_MORPH_FADEOUT_TIME 1.4f
+
+class LLVisualParam;
+
+//-----------------------------------------------------------------------------
+// class LLEmote
+//-----------------------------------------------------------------------------
+class LLEmote :
+    public LLMotion
+{
+public:
+    // Constructor
+    LLEmote(const LLUUID &id);
+
+    // Destructor
+    virtual ~LLEmote();
+
+public:
+    //-------------------------------------------------------------------------
+    // 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); }
+
+public:
+    //-------------------------------------------------------------------------
+    // animation callbacks to be implemented by subclasses
+    //-------------------------------------------------------------------------
+
+    // 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 "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; }
+
+    // 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; }
+
+    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);
+
+    // 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 when a motion is deactivated
+    virtual void onDeactivate();
+
+    virtual bool canDeprecate() { return false; }
+
+protected:
+
+    LLCharacter*        mCharacter;
+
+    LLVisualParam*      mParam;
+};
+
+
+
+#endif // LL_LLEMOTE_H
+
+