diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-14 09:01:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-14 09:01:56 -0400 |
| commit | 24c1b62e27e066dc62e7681593ce7c93ee84d5a8 (patch) | |
| tree | 76d5b8a1c4eb43073e85156d74e8f3eac11dfe74 /indra/newview/llvoavatarself.cpp | |
| parent | 2c2167229eac3efd7e7b1c5eafde8ee2e66184cd (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
merge back beta fixes
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 |