diff options
Diffstat (limited to 'linden/indra/newview/llvoavatar.h')
-rw-r--r-- | linden/indra/newview/llvoavatar.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index 2033fda..bc68cf4 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h | |||
@@ -694,7 +694,6 @@ public: | |||
694 | //-------------------------------------------------------------------- | 694 | //-------------------------------------------------------------------- |
695 | // texture ids and pointers | 695 | // texture ids and pointers |
696 | //-------------------------------------------------------------------- | 696 | //-------------------------------------------------------------------- |
697 | LLUUID mShadowImageID; | ||
698 | LLPointer<LLViewerImage> mShadowImagep; | 697 | LLPointer<LLViewerImage> mShadowImagep; |
699 | 698 | ||
700 | LLUUID mLastHeadBakedID; | 699 | LLUUID mLastHeadBakedID; |
@@ -909,6 +908,8 @@ protected: | |||
909 | BOOL mNameMute; | 908 | BOOL mNameMute; |
910 | BOOL mNameAppearance; | 909 | BOOL mNameAppearance; |
911 | BOOL mVisibleChat; | 910 | BOOL mVisibleChat; |
911 | BOOL mRenderGroupTitles; | ||
912 | |||
912 | 913 | ||
913 | LLString mDebugText; | 914 | LLString mDebugText; |
914 | U64 mLastRegionHandle; | 915 | U64 mLastRegionHandle; |
@@ -982,6 +983,7 @@ protected: | |||
982 | LLHost getObjectHost() const; | 983 | LLHost getObjectHost() const; |
983 | S32 getLocalDiscardLevel( S32 index); | 984 | S32 getLocalDiscardLevel( S32 index); |
984 | 985 | ||
986 | void shame(); //generate shame metric | ||
985 | //Ventrella | 987 | //Ventrella |
986 | //----------------------------------------------------------------------------------------------- | 988 | //----------------------------------------------------------------------------------------------- |
987 | // the Voice Visualizer is responsible for detecting the user's voice signal, and when the | 989 | // the Voice Visualizer is responsible for detecting the user's voice signal, and when the |
@@ -991,7 +993,11 @@ protected: | |||
991 | LLVoiceVisualizer * mVoiceVisualizer; | 993 | LLVoiceVisualizer * mVoiceVisualizer; |
992 | int mCurrentGesticulationLevel; | 994 | int mCurrentGesticulationLevel; |
993 | //End Ventrella | 995 | //End Ventrella |
994 | 996 | ||
997 | private: | ||
998 | static S32 sFreezeCounter ; | ||
999 | public: | ||
1000 | static void updateFreezeCounter(S32 counter = 0 ) ; | ||
995 | }; | 1001 | }; |
996 | 1002 | ||
997 | #endif // LL_VO_AVATAR_H | 1003 | #endif // LL_VO_AVATAR_H |