diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llvoavatar.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index f6d5e27..f759e15 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h | |||
@@ -534,6 +534,8 @@ public: | |||
534 | LLViewerJoint mRoot; // avatar skeleton | 534 | LLViewerJoint mRoot; // avatar skeleton |
535 | BOOL mIsSitting; // sitting state | 535 | BOOL mIsSitting; // sitting state |
536 | 536 | ||
537 | static bool updateClientTags(); | ||
538 | static bool loadClientTags(); | ||
537 | //-------------------------------------------------------------------- | 539 | //-------------------------------------------------------------------- |
538 | // Private member variables. | 540 | // Private member variables. |
539 | //-------------------------------------------------------------------- | 541 | //-------------------------------------------------------------------- |
@@ -590,12 +592,19 @@ private: | |||
590 | 592 | ||
591 | // Animation timer | 593 | // Animation timer |
592 | LLTimer mAnimTimer; | 594 | LLTimer mAnimTimer; |
593 | F32 mTimeLast; | 595 | F32 mTimeLast; |
596 | |||
594 | 597 | ||
595 | // Send selection beam info to scripts | 598 | // Send selection beam info to scripts |
596 | static int sPartsNow; | 599 | static int sPartsNow; |
597 | static LLVector3d sBeamLastAt; | 600 | static LLVector3d sBeamLastAt; |
601 | static LLSD sClientResolutionList; | ||
602 | |||
603 | static void resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar); | ||
604 | //Imprudence FIXME | ||
605 | // friend class LLFloaterAvatarList; | ||
598 | 606 | ||
607 | protected: | ||
599 | LLPointer<LLHUDEffectSpiral> mBeam; | 608 | LLPointer<LLHUDEffectSpiral> mBeam; |
600 | LLFrameTimer mBeamTimer; | 609 | LLFrameTimer mBeamTimer; |
601 | 610 | ||