diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-27 21:02:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-27 21:02:01 +0000 |
| commit | 926ea0b39afd04cab469ca17b28f95ebf969e669 (patch) | |
| tree | 40d5653e19160f72e7a0b80fadb9bdb93ef3575c /indra/newview/llvoavatar.h | |
| parent | 41877d457ab9542dca22b99f3eddb1bfcfe7c1d6 (diff) | |
QAR-669 1.20 Viewer RC11
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index b991ae305e..54fd7d370f 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -757,9 +757,9 @@ public: //-------------------------------------------------------------------- F32 mSpeed; - // + //-------------------------------------------------------------------- // Shadow stuff - // + //-------------------------------------------------------------------- LLDrawable* mShadow; BOOL mInAir; LLFrameTimer mTimeInAir; @@ -1013,7 +1013,7 @@ protected: LLHost getObjectHost() const; S32 getLocalDiscardLevel( S32 index); -//Ventrella + //----------------------------------------------------------------------------------------------- // the Voice Visualizer is responsible for detecting the user's voice signal, and when the // user speaks, it puts a voice symbol over the avatar's head, and triggering gesticulations @@ -1021,7 +1021,6 @@ protected: private: LLVoiceVisualizer * mVoiceVisualizer; int mCurrentGesticulationLevel; -//End Ventrella private: static S32 sFreezeCounter ; |