diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-19 17:22:12 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-19 17:22:12 -0700 |
commit | d603085c0332f5d615cc6583e13ed0aa5ab21908 (patch) | |
tree | bac8d5e6b99643448579060d38a2e69fab65caf7 /indra/newview/llvoavatar.h | |
parent | 474457ea7ea1bd178682788426a4cf40c3fffdcd (diff) | |
parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) |
Merge with dessie/viewer-release
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 5de406ff01..6798fbbc33 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -879,7 +879,7 @@ private: public: // Responsible for detecting the user's voice signal (and when the // user speaks, it puts a voice symbol over the avatar's head) and gesticulations - LLVoiceVisualizer* mVoiceVisualizer; + LLPointer<LLVoiceVisualizer> mVoiceVisualizer; int mCurrentGesticulationLevel; //-------------------------------------------------------------------- @@ -1059,5 +1059,6 @@ protected: // Shared with LLVOAvatarSelf *******************************************************************************/ }; // LLVOAvatar +extern const F32 SELF_ADDITIONAL_PRI; #endif // LL_VO_AVATAR_H |