aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter/llcharacter.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llcharacter/llcharacter.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llcharacter/llcharacter.h b/linden/indra/llcharacter/llcharacter.h
index bfe3ffa..6f4fe17 100644
--- a/linden/indra/llcharacter/llcharacter.h
+++ b/linden/indra/llcharacter/llcharacter.h
@@ -40,6 +40,7 @@
40#include "linked_lists.h" 40#include "linked_lists.h"
41#include "string_table.h" 41#include "string_table.h"
42#include "llmemory.h" 42#include "llmemory.h"
43#include "llthread.h"
43 44
44class LLPolyMesh; 45class LLPolyMesh;
45 46
@@ -109,7 +110,7 @@ public:
109 virtual F32 getTimeDilation() = 0; 110 virtual F32 getTimeDilation() = 0;
110 111
111 // gets current pixel area of this character 112 // gets current pixel area of this character
112 virtual F32 getPixelArea() = 0; 113 virtual F32 getPixelArea() const = 0;
113 114
114 // gets the head mesh of the character 115 // gets the head mesh of the character
115 virtual LLPolyMesh* getHeadMesh() = 0; 116 virtual LLPolyMesh* getHeadMesh() = 0;
@@ -242,7 +243,7 @@ public:
242 U32 getSkeletonSerialNum() const { return mSkeletonSerialNum; } 243 U32 getSkeletonSerialNum() const { return mSkeletonSerialNum; }
243 void setSkeletonSerialNum( U32 num ) { mSkeletonSerialNum = num; } 244 void setSkeletonSerialNum( U32 num ) { mSkeletonSerialNum = num; }
244 245
245 static LLLinkedList< LLCharacter > sInstances; 246 static std::vector< LLCharacter* > sInstances;
246 247
247protected: 248protected:
248 LLMotionController mMotionController; 249 LLMotionController mMotionController;