diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-03-25 22:50:26 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-03-25 22:50:26 +0000 |
commit | 6fcf38217e8772b2f90c7a8e7ce6b60071f6d20c (patch) | |
tree | a8e35fe195cc86c616daf9d8a21571e04bc2bc35 /indra/newview/llvoavatar.h | |
parent | 11a3589665aae1a2423e258e40eba45c117627d5 (diff) |
merge release@82858 maint-render-2-merge@83010 -> release
QAR-389
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index ae0656f3ea..a6731c3e31 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -984,6 +984,7 @@ protected: LLHost getObjectHost() const; S32 getLocalDiscardLevel( S32 index); + void shame(); //generate shame metric //Ventrella //----------------------------------------------------------------------------------------------- // the Voice Visualizer is responsible for detecting the user's voice signal, and when the @@ -993,7 +994,11 @@ protected: LLVoiceVisualizer * mVoiceVisualizer; int mCurrentGesticulationLevel; //End Ventrella - + +private: + static S32 sFreezeCounter ; +public: + static void updateFreezeCounter(S32 counter = 0 ) ; }; #endif // LL_VO_AVATAR_H |