summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llpose.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcharacter/llpose.h')
-rw-r--r--indra/llcharacter/llpose.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h
index e286c14e21..5d17bd8458 100644
--- a/indra/llcharacter/llpose.h
+++ b/indra/llcharacter/llpose.h
@@ -87,8 +87,10 @@ class LLMotion;
class LLPoseBlender
{
protected:
- LLMap<LLJoint*,LLJointStateBlender*> mJointStateBlenderPool;
- LLLinkedList<LLJointStateBlender> mActiveBlenders;
+ typedef std::list<LLJointStateBlender*> blender_list_t;
+ typedef std::map<LLJoint*,LLJointStateBlender*> blender_map_t;
+ blender_map_t mJointStateBlenderPool;
+ blender_list_t mActiveBlenders;
S32 mNextPoseSlot;
LLPose mBlendedPose;