From c355fb98d3f4040196b7b8586dc9328fccb906d2 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Mon, 3 Sep 2012 06:12:50 +0000
Subject: Extracted texture baking system into llappearance library.

---
 indra/llappearance/lljointpickname.h | 46 ++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 indra/llappearance/lljointpickname.h

(limited to 'indra/llappearance/lljointpickname.h')

diff --git a/indra/llappearance/lljointpickname.h b/indra/llappearance/lljointpickname.h
new file mode 100644
index 0000000000..17181520e3
--- /dev/null
+++ b/indra/llappearance/lljointpickname.h
@@ -0,0 +1,46 @@
+/** 
+ * @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$
+ */
+
+
+#ifndef LL_LLJOINTPICKNAME_H
+#define LL_LLJOINTPICKNAME_H
+
+
+// Sets the OpenGL selection stack name that is pushed and popped
+// with this joint state.  The default value indicates that no name
+// 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
+};
+
+#endif // LL_LLJOINTPICKNAME_H
-- 
cgit v1.2.3


From e1580128ab2a42ecd4019ef35069f9e939dc4ff2 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Sun, 9 Sep 2012 12:12:19 +0000
Subject: Fixed crashes on login.  Moved most of the remaining
 character/skeleton generation code into llappearance.   Moved non-rendering
 related LLViewerJoint functionality into LLAvatarJoint.

---
 indra/llappearance/lljointpickname.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llappearance/lljointpickname.h')

diff --git a/indra/llappearance/lljointpickname.h b/indra/llappearance/lljointpickname.h
index 17181520e3..1d41a761fc 100644
--- a/indra/llappearance/lljointpickname.h
+++ b/indra/llappearance/lljointpickname.h
@@ -28,6 +28,7 @@
 #ifndef LL_LLJOINTPICKNAME_H
 #define LL_LLJOINTPICKNAME_H
 
+class LLAvatarJointMesh;
 
 // Sets the OpenGL selection stack name that is pushed and popped
 // with this joint state.  The default value indicates that no name
@@ -43,4 +44,6 @@ enum LLJointPickName
 	PN_5 = 5
 };
 
+typedef std::vector<LLAvatarJointMesh*> avatar_joint_mesh_list_t;
+
 #endif // LL_LLJOINTPICKNAME_H
-- 
cgit v1.2.3