diff options
| author | callum_linden <none@none> | 2015-07-02 09:40:49 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-07-02 09:40:49 -0700 |
| commit | 71406f1af805d0b88e348b81a67bcde3d0b3d885 (patch) | |
| tree | 9eab3e24208d2aecedf29eed0eebb6f209197475 /indra/newview/llvoavatar.cpp | |
| parent | d89b4109f9ac3f1ef95480823df292bbc8200347 (diff) | |
| parent | 8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (diff) | |
Merge with head
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 6e0d77b10a..a573b16954 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 @@ -2148,7 +2149,7 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time) idleUpdateBelowWater(); // wind effect uses this idleUpdateWindEffect(); } - + idleUpdateNameTag( root_pos_last ); idleUpdateRenderCost(); } |