diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-09-07 10:23:19 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-09-07 10:23:19 -0400 |
commit | 16031c354ff37462acac4d2dd1effe0af9a8745a (patch) | |
tree | 0365cac395bc8b97a21a8e3e46b01a0f8d0617e4 /indra/newview/llvoavatar.cpp | |
parent | 51ecc8208a1b70c9742656230df00b08e082a9c8 (diff) | |
parent | ebfbaad9696ce0389ed1a9642d58dfb4a0abdc17 (diff) |
automated merge from viewer-development
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r-- | indra/newview/llvoavatar.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 9af1198df1..f985ee0c15 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2320,7 +2320,6 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) idleUpdateNameTag( root_pos_last ); idleUpdateRenderCost(); - idleUpdateTractorBeam(); return TRUE; } @@ -3075,14 +3074,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) } } -//-------------------------------------------------------------------- -// draw tractor beam when editing objects -//-------------------------------------------------------------------- -// virtual -void LLVOAvatar::idleUpdateTractorBeam() -{ -} - void LLVOAvatar::idleUpdateBelowWater() { F32 avatar_height = (F32)(getPositionGlobal().mdV[VZ]); |