summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-06-30 16:46:45 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-06-30 16:46:45 -0400
commit491f30e43e571fca9939930a5e8d10caa5f65ad2 (patch)
treecd5ccb95b4b32374545a0bda36a49bebd9e5b2a0 /indra/newview/llvoavatar.cpp
parent6c6b509aa3d4ca1e4620a80f0b6235393af2a33a (diff)
parent4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff)
merge
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-xindra/newview/llvoavatar.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 9113b900d0..f753448770 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();
}