diff options
author | nyx@NyxTop <nyx@NyxTop> | 2009-10-29 15:13:27 -0400 |
---|---|---|
committer | nyx@NyxTop <nyx@NyxTop> | 2009-10-29 15:13:27 -0400 |
commit | 65f534899740018b8efb662f8154030edb07fc0f (patch) | |
tree | 5a9697d4fb5a6004a80545804db11c51e1bdfc4c /indra/newview/llvoavatar.h | |
parent | bc9808a01710ab21d60df3b6652b500f31f1c40e (diff) |
EXT-1945 visual parameter animations broken
First round of fixes for trying to fix the visual param animations
Code reviewed by Seraph
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index e3add8aa78..f7c794defe 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -205,7 +205,7 @@ public: virtual BOOL updateCharacter(LLAgent &agent); void idleUpdateVoiceVisualizer(bool voice_enabled); void idleUpdateMisc(bool detailed_update); - void idleUpdateAppearanceAnimation(); + virtual void idleUpdateAppearanceAnimation(); void idleUpdateLipSync(bool voice_enabled); void idleUpdateLoadingEffect(); void idleUpdateWindEffect(); @@ -250,6 +250,7 @@ protected: virtual BOOL updateIsFullyLoaded(); BOOL processFullyLoadedChange(bool loading); void updateRuthTimer(bool loading); + F32 calcMorphAmount(); private: BOOL mFullyLoaded; BOOL mPreviousFullyLoaded; @@ -276,7 +277,7 @@ public: protected: static BOOL parseSkeletonFile(const std::string& filename); void buildCharacter(); - BOOL loadAvatar(); + virtual BOOL loadAvatar(); BOOL setupBone(const LLVOAvatarBoneInfo* info, LLViewerJoint* parent, S32 ¤t_volume_num, S32 ¤t_joint_num); BOOL buildSkeleton(const LLVOAvatarSkeletonInfo *info); |