Fix line endlings

1 files changed, 77 insertions, 77 deletions

diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h
index 3332dbde81..cfe8ecdb67 100644
--- a/indra/newview/llviewerjointmesh.h
+++ b/indra/newview/llviewerjointmesh.h
@@ -1,77 +1,77 @@
-/**

- * @file llviewerjointmesh.h

- * @brief Declaration of LLViewerJointMesh class

- *

- * $LicenseInfo:firstyear=2001&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_LLVIEWERJOINTMESH_H

-#define LL_LLVIEWERJOINTMESH_H

-

-#include "llviewerjoint.h"

-#include "llviewertexture.h"

-#include "llavatarjointmesh.h"

-#include "llpolymesh.h"

-#include "v4color.h"

-

-class LLDrawable;

-class LLFace;

-class LLCharacter;

-class LLViewerTexLayerSet;

-

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

-// class LLViewerJointMesh

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

-class LLViewerJointMesh : public LLAvatarJointMesh, public LLViewerJoint

-{

-public:

-    // Constructor

-    LLViewerJointMesh();

-

-    // Destructor

-    virtual ~LLViewerJointMesh();

-

-    // Render time method to upload batches of joint matrices

-    void uploadJointMatrices();

-

-    // overloaded from base class

-    U32 drawShape( F32 pixelArea, bool first_pass, bool is_dummy ) override;

-

-    // necessary because MS's compiler warns on function inheritance via dominance in the diamond inheritance here.

-    // warns even though LLViewerJoint holds the only non virtual implementation.

-    U32 render(F32 pixelArea, bool first_pass = true, bool is_dummy = false) override { return LLViewerJoint::render(pixelArea, first_pass, is_dummy); }

-

-    void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area) override;

-    void updateFaceData(LLFace *face, F32 pixel_area, bool damp_wind = false, bool terse_update = false) override;

-    bool updateLOD(F32 pixel_area, bool activate) override;

-    void updateJointGeometry() override;

-    void dump() override;

-

-    bool isAnimatable() const override { return false; }

-

-private:

-

-    //copy mesh into given face's vertex buffer, applying current animation pose

-    static void updateGeometry(LLFace* face, LLPolyMesh* mesh);

-};

-

-#endif // LL_LLVIEWERJOINTMESH_H

+/**
+ * @file llviewerjointmesh.h
+ * @brief Declaration of LLViewerJointMesh class
+ *
+ * $LicenseInfo:firstyear=2001&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_LLVIEWERJOINTMESH_H
+#define LL_LLVIEWERJOINTMESH_H
+
+#include "llviewerjoint.h"
+#include "llviewertexture.h"
+#include "llavatarjointmesh.h"
+#include "llpolymesh.h"
+#include "v4color.h"
+
+class LLDrawable;
+class LLFace;
+class LLCharacter;
+class LLViewerTexLayerSet;
+
+//-----------------------------------------------------------------------------
+// class LLViewerJointMesh
+//-----------------------------------------------------------------------------
+class LLViewerJointMesh : public LLAvatarJointMesh, public LLViewerJoint
+{
+public:
+    // Constructor
+    LLViewerJointMesh();
+
+    // Destructor
+    virtual ~LLViewerJointMesh();
+
+    // Render time method to upload batches of joint matrices
+    void uploadJointMatrices();
+
+    // overloaded from base class
+    U32 drawShape( F32 pixelArea, bool first_pass, bool is_dummy ) override;
+
+    // necessary because MS's compiler warns on function inheritance via dominance in the diamond inheritance here.
+    // warns even though LLViewerJoint holds the only non virtual implementation.
+    U32 render(F32 pixelArea, bool first_pass = true, bool is_dummy = false) override { return LLViewerJoint::render(pixelArea, first_pass, is_dummy); }
+
+    void updateFaceSizes(U32 &num_vertices, U32& num_indices, F32 pixel_area) override;
+    void updateFaceData(LLFace *face, F32 pixel_area, bool damp_wind = false, bool terse_update = false) override;
+    bool updateLOD(F32 pixel_area, bool activate) override;
+    void updateJointGeometry() override;
+    void dump() override;
+
+    bool isAnimatable() const override { return false; }
+
+private:
+
+    //copy mesh into given face's vertex buffer, applying current animation pose
+    static void updateGeometry(LLFace* face, LLPolyMesh* mesh);
+};
+
+#endif // LL_LLVIEWERJOINTMESH_H