Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/llappearance/lljointpickname.h b/indra/llappearance/lljointpickname.h
index 1d41a761fc..93c827ac21 100644
--- a/indra/llappearance/lljointpickname.h
+++ b/indra/llappearance/lljointpickname.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lljointpickname.h
  * @brief Defines OpenGL seleciton stack names
  *
  * $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$
  */
@@ -35,13 +35,13 @@ class LLAvatarJointMesh;
 // should be pushed/popped.
 enum LLJointPickName
 {
-	PN_DEFAULT = -1,
-	PN_0 = 0,
-	PN_1 = 1,
-	PN_2 = 2,
-	PN_3 = 3,
-	PN_4 = 4,
-	PN_5 = 5
+    PN_DEFAULT = -1,
+    PN_0 = 0,
+    PN_1 = 1,
+    PN_2 = 2,
+    PN_3 = 3,
+    PN_4 = 4,
+    PN_5 = 5
 };
 
 typedef std::vector<LLAvatarJointMesh*> avatar_joint_mesh_list_t;