diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
commit | 0e06dc8964d5ae31fccb2da522d05d822530d3c7 (patch) | |
tree | d15dfd4ab9dfc4724efe62373cbca6a24c97006b /indra/newview/llvoavatar.h | |
parent | 4c9760a073853ae81a78aa99119c059cdfaba664 (diff) | |
parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) |
Merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 6798fbbc33..5de406ff01 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 - LLPointer<LLVoiceVisualizer> mVoiceVisualizer; + LLVoiceVisualizer* mVoiceVisualizer; int mCurrentGesticulationLevel; //-------------------------------------------------------------------- @@ -1059,6 +1059,5 @@ protected: // Shared with LLVOAvatarSelf *******************************************************************************/ }; // LLVOAvatar -extern const F32 SELF_ADDITIONAL_PRI; #endif // LL_VO_AVATAR_H |