summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-08-12 11:40:54 -0500
committerDave Parks <davep@lindenlab.com>2010-08-12 11:40:54 -0500
commitddd7a3ebb58fb56fe100b4fe2dc0e5e8076948d6 (patch)
treef5f51488242cffa9e7a0f93a103868d20fb0f668 /indra/newview
parent91c1545f906bf3bfca6b1311bfedb1af1b3353f1 (diff)
Make rigged attachments respect "Show me in mouselook" option.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lldrawpoolavatar.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index c7e77fd6ba..ef1d2ec1c5 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -38,6 +38,7 @@
#include "llvoavatar.h"
#include "m3math.h"
+#include "llagent.h" //for gAgent.needsRenderAvatar()
#include "lldrawable.h"
#include "lldrawpoolbump.h"
#include "llface.h"
@@ -1274,6 +1275,11 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLFace* face, const LLMeshSk
void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
{
+ if (avatar->isSelf() && !gAgent.needsRenderAvatar())
+ {
+ return;
+ }
+
for (U32 i = 0; i < mRiggedFace[type].size(); ++i)
{
LLFace* face = mRiggedFace[type][i];