diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-02-24 21:02:12 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-02-24 21:02:12 -0500 |
| commit | b5324afb6f2e45deefb9b79e7e2192bc686b181a (patch) | |
| tree | dcae0395e2975f736a90c1fa3c67d6f318e01cc7 /indra/newview/llvoavatar.cpp | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
| parent | c7841b48bdec74848a64e2dd0eac453ce855093d (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 444a26779a..2d62b807b0 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -43,6 +43,7 @@ #include "llanimationstates.h" #include "llavatarnamecache.h" #include "llavatarpropertiesprocessor.h" +#include "llexperiencecache.h" #include "llphysicsmotion.h" #include "llviewercontrol.h" #include "llcallingcard.h" // IDEVO for LLAvatarTracker @@ -2145,7 +2146,7 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time) idleUpdateBelowWater(); // wind effect uses this idleUpdateWindEffect(); } - + idleUpdateNameTag( root_pos_last ); idleUpdateRenderCost(); } |