summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-07-13 13:04:16 -0400
committerOz Linden <oz@lindenlab.com>2012-07-13 13:04:16 -0400
commitc3d9f0e41cc0cde6f1383225a8937d128e5838d8 (patch)
tree24d60b5329c102c672ccd55e31527a1f304eca6a /indra/newview/llvoavatar.h
parent254c2703632ef5d7a875597d4907804c63ed8e72 (diff)
parente51a60536dc082be563c2f5b3b4f86df843d3a14 (diff)
merge changes for DRTVWR-179
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r--[-rwxr-xr-x]indra/newview/llvoavatar.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 4081a1408d..f5692bb52f 100755..100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -366,6 +366,10 @@ public:
LLVector3 mHeadOffset; // current head position
LLViewerJoint mRoot;
+
+ typedef std::map<std::string, LLJoint*> joint_map_t;
+ joint_map_t mJointMap;
+
protected:
static BOOL parseSkeletonFile(const std::string& filename);
void buildCharacter();