Skip to content
Snippets Groups Projects
Commit fff9dde8 authored by Brad Payne (Vir Linden)'s avatar Brad Payne (Vir Linden)
Browse files

SL-726, SL-718 - refactoring updateCharacter()

parent 2aa890da
No related branches found
No related tags found
No related merge requests found
...@@ -210,7 +210,6 @@ void LLControlAvatar::markForDeath() ...@@ -210,7 +210,6 @@ void LLControlAvatar::markForDeath()
mMarkedForDeath = true; mMarkedForDeath = true;
} }
// static
void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time) void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
{ {
if (mMarkedForDeath) if (mMarkedForDeath)
...@@ -224,6 +223,11 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time) ...@@ -224,6 +223,11 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
} }
} }
BOOL LLControlAvatar::updateCharacter(LLAgent &agent)
{
return LLVOAvatar::updateCharacter(agent);
}
//virtual //virtual
void LLControlAvatar::updateDebugText() void LLControlAvatar::updateDebugText()
{ {
......
...@@ -51,6 +51,7 @@ class LLControlAvatar: ...@@ -51,6 +51,7 @@ class LLControlAvatar:
void markForDeath(); void markForDeath();
virtual void idleUpdate(LLAgent &agent, const F64 &time); virtual void idleUpdate(LLAgent &agent, const F64 &time);
virtual BOOL updateCharacter(LLAgent &agent);
void getAnimatedVolumes(std::vector<LLVOVolume*>& volumes); void getAnimatedVolumes(std::vector<LLVOVolume*>& volumes);
void updateAnimations(); void updateAnimations();
......
This diff is collapsed.
...@@ -245,6 +245,10 @@ class LLVOAvatar : ...@@ -245,6 +245,10 @@ class LLVOAvatar :
public: public:
virtual void updateDebugText(); virtual void updateDebugText();
virtual BOOL updateCharacter(LLAgent &agent); virtual BOOL updateCharacter(LLAgent &agent);
void updateFootstepSounds();
void computeUpdatePeriod();
void updateOrientation(LLAgent &agent, F32 speed, F32 delta_time);
void updateTimeStep();
void idleUpdateVoiceVisualizer(bool voice_enabled); void idleUpdateVoiceVisualizer(bool voice_enabled);
void idleUpdateMisc(bool detailed_update); void idleUpdateMisc(bool detailed_update);
virtual void idleUpdateAppearanceAnimation(); virtual void idleUpdateAppearanceAnimation();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment