summaryrefslogtreecommitdiff
path: root/indra/newview/llcontrolavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-09-11 21:40:39 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-09-11 21:40:39 +0100
commitfff9dde8a8ec5f3afb2ebd32fc0d54827671fc2a (patch)
treeb664fc76f5cc78845314280453132728ba6e8bf2 /indra/newview/llcontrolavatar.cpp
parent2aa890da0bd8b42493745daa736c5ed9451bbf91 (diff)
SL-726, SL-718 - refactoring updateCharacter()
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
-rw-r--r--indra/newview/llcontrolavatar.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 172816b3e3..fa578907c8 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -210,7 +210,6 @@ void LLControlAvatar::markForDeath()
mMarkedForDeath = true;
}
-// static
void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
{
if (mMarkedForDeath)
@@ -224,6 +223,11 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
}
}
+BOOL LLControlAvatar::updateCharacter(LLAgent &agent)
+{
+ return LLVOAvatar::updateCharacter(agent);
+}
+
//virtual
void LLControlAvatar::updateDebugText()
{