aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter/llcharacter.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcharacter/llcharacter.h')
-rw-r--r--linden/indra/llcharacter/llcharacter.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/llcharacter/llcharacter.h b/linden/indra/llcharacter/llcharacter.h
index 6699796..46faab1 100644
--- a/linden/indra/llcharacter/llcharacter.h
+++ b/linden/indra/llcharacter/llcharacter.h
@@ -39,9 +39,7 @@
39 39
40#include "lljoint.h" 40#include "lljoint.h"
41#include "llmotioncontroller.h" 41#include "llmotioncontroller.h"
42#include "llassoclist.h"
43#include "llvisualparam.h" 42#include "llvisualparam.h"
44#include "linked_lists.h"
45#include "string_table.h" 43#include "string_table.h"
46#include "llmemory.h" 44#include "llmemory.h"
47#include "llthread.h" 45#include "llthread.h"
@@ -255,7 +253,8 @@ public:
255protected: 253protected:
256 LLMotionController mMotionController; 254 LLMotionController mMotionController;
257 255
258 LLAssocList<std::string, void *> mAnimationData; 256 typedef std::map<std::string, void *> animation_data_map_t;
257 animation_data_map_t mAnimationData;
259 258
260 F32 mPreferredPelvisHeight; 259 F32 mPreferredPelvisHeight;
261 ESex mSex; 260 ESex mSex;