diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
commit | 268d5bd4bd4c9311053808b1f7aa74a85aa038a5 (patch) | |
tree | e777c21cf2a9e1d2a115c96bff080ebe2d0edb31 /indra/newview/llvoavatarself.cpp | |
parent | ce417a01c9a5cb0befc68533734d98023a03b96e (diff) | |
parent | 337976096530729a7d671df68907cd59a7986972 (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r-- | indra/newview/llvoavatarself.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 6d672acc32..07b9b78255 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -668,15 +668,13 @@ BOOL LLVOAvatarSelf::updateCharacter(LLAgent &agent) } // virtual -BOOL LLVOAvatarSelf::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) +void LLVOAvatarSelf::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) { - if (!isAgentAvatarValid()) + if (isAgentAvatarValid()) { - return TRUE; + LLVOAvatar::idleUpdate(agent, world, time); + idleUpdateTractorBeam(); } - LLVOAvatar::idleUpdate(agent, world, time); - idleUpdateTractorBeam(); - return TRUE; } // virtual |