summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llcharacter.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcharacter/llcharacter.h')
-rw-r--r--indra/llcharacter/llcharacter.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index eb001d5fc7..a5719b0685 100644
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -39,9 +39,7 @@
#include "lljoint.h"
#include "llmotioncontroller.h"
-#include "llassoclist.h"
#include "llvisualparam.h"
-#include "linked_lists.h"
#include "string_table.h"
#include "llmemory.h"
#include "llthread.h"
@@ -255,7 +253,8 @@ public:
protected:
LLMotionController mMotionController;
- LLAssocList<std::string, void *> mAnimationData;
+ typedef std::map<std::string, void *> animation_data_map_t;
+ animation_data_map_t mAnimationData;
F32 mPreferredPelvisHeight;
ESex mSex;