diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
| commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
| tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /indra/llcharacter/llcharacter.h | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'indra/llcharacter/llcharacter.h')
| -rw-r--r-- | indra/llcharacter/llcharacter.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h index f2f106f360..0ed22f81f7 100644 --- a/indra/llcharacter/llcharacter.h +++ b/indra/llcharacter/llcharacter.h @@ -21,6 +21,7 @@ #include "linked_lists.h" #include "string_table.h" #include "llmemory.h" +#include "llthread.h" class LLPolyMesh; @@ -90,7 +91,7 @@ public: virtual F32 getTimeDilation() = 0; // gets current pixel area of this character - virtual F32 getPixelArea() = 0; + virtual F32 getPixelArea() const = 0; // gets the head mesh of the character virtual LLPolyMesh* getHeadMesh() = 0; @@ -223,7 +224,7 @@ public: U32 getSkeletonSerialNum() const { return mSkeletonSerialNum; } void setSkeletonSerialNum( U32 num ) { mSkeletonSerialNum = num; } - static LLLinkedList< LLCharacter > sInstances; + static std::vector< LLCharacter* > sInstances; protected: LLMotionController mMotionController; |