diff options
author | Jacek Antonelli | 2008-08-15 23:45:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:57 -0500 |
commit | 7e3007b63521c4b0c5bbad1c3964a557fc526ce2 (patch) | |
tree | ab231ed574db618873d6ebb25293cf7c0cb6d26e /linden/indra/newview/llvoavatar.h | |
parent | Second Life viewer sources 1.20.10 (diff) | |
download | meta-impy-7e3007b63521c4b0c5bbad1c3964a557fc526ce2.zip meta-impy-7e3007b63521c4b0c5bbad1c3964a557fc526ce2.tar.gz meta-impy-7e3007b63521c4b0c5bbad1c3964a557fc526ce2.tar.bz2 meta-impy-7e3007b63521c4b0c5bbad1c3964a557fc526ce2.tar.xz |
Second Life viewer sources 1.20.11
Diffstat (limited to 'linden/indra/newview/llvoavatar.h')
-rw-r--r-- | linden/indra/newview/llvoavatar.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index 1df8275..a1f5bd2 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h | |||
@@ -751,9 +751,9 @@ public: | |||
751 | //-------------------------------------------------------------------- | 751 | //-------------------------------------------------------------------- |
752 | F32 mSpeed; | 752 | F32 mSpeed; |
753 | 753 | ||
754 | // | 754 | //-------------------------------------------------------------------- |
755 | // Shadow stuff | 755 | // Shadow stuff |
756 | // | 756 | //-------------------------------------------------------------------- |
757 | LLDrawable* mShadow; | 757 | LLDrawable* mShadow; |
758 | BOOL mInAir; | 758 | BOOL mInAir; |
759 | LLFrameTimer mTimeInAir; | 759 | LLFrameTimer mTimeInAir; |
@@ -1009,7 +1009,7 @@ protected: | |||
1009 | S32 getLocalDiscardLevel( S32 index); | 1009 | S32 getLocalDiscardLevel( S32 index); |
1010 | 1010 | ||
1011 | void shame(); //generate shame metric | 1011 | void shame(); //generate shame metric |
1012 | //Ventrella | 1012 | |
1013 | //----------------------------------------------------------------------------------------------- | 1013 | //----------------------------------------------------------------------------------------------- |
1014 | // the Voice Visualizer is responsible for detecting the user's voice signal, and when the | 1014 | // the Voice Visualizer is responsible for detecting the user's voice signal, and when the |
1015 | // user speaks, it puts a voice symbol over the avatar's head, and triggering gesticulations | 1015 | // user speaks, it puts a voice symbol over the avatar's head, and triggering gesticulations |
@@ -1017,7 +1017,6 @@ protected: | |||
1017 | private: | 1017 | private: |
1018 | LLVoiceVisualizer * mVoiceVisualizer; | 1018 | LLVoiceVisualizer * mVoiceVisualizer; |
1019 | int mCurrentGesticulationLevel; | 1019 | int mCurrentGesticulationLevel; |
1020 | //End Ventrella | ||
1021 | 1020 | ||
1022 | private: | 1021 | private: |
1023 | static S32 sFreezeCounter ; | 1022 | static S32 sFreezeCounter ; |