aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter/llpose.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llcharacter/llpose.h
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/llcharacter/llpose.h')
-rw-r--r--linden/indra/llcharacter/llpose.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/llcharacter/llpose.h b/linden/indra/llcharacter/llpose.h
index 12d1640..f57f7de 100644
--- a/linden/indra/llcharacter/llpose.h
+++ b/linden/indra/llcharacter/llpose.h
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 5 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -106,8 +107,10 @@ class LLMotion;
106class LLPoseBlender 107class LLPoseBlender
107{ 108{
108protected: 109protected:
109 LLMap<LLJoint*,LLJointStateBlender*> mJointStateBlenderPool; 110 typedef std::list<LLJointStateBlender*> blender_list_t;
110 LLLinkedList<LLJointStateBlender> mActiveBlenders; 111 typedef std::map<LLJoint*,LLJointStateBlender*> blender_map_t;
112 blender_map_t mJointStateBlenderPool;
113 blender_list_t mActiveBlenders;
111 114
112 S32 mNextPoseSlot; 115 S32 mNextPoseSlot;
113 LLPose mBlendedPose; 116 LLPose mBlendedPose;