summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjointmesh.h
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-06-22 18:59:31 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-06-22 18:59:31 -0700
commit6e710333e7ea08a79c401ae54d063d8ef608f99a (patch)
treeff0dbcf29032ff9da18c8d86be7dd622ed180583 /indra/newview/llviewerjointmesh.h
parent7cc44fb7fe40706e2017343d76ed226f477dad8d (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/newview/llviewerjointmesh.h')
-rw-r--r--indra/newview/llviewerjointmesh.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h
index 0191f0cae8..dd5dae1dc1 100644
--- a/indra/newview/llviewerjointmesh.h
+++ b/indra/newview/llviewerjointmesh.h
@@ -61,6 +61,7 @@ public:
//-----------------------------------------------------------------------------
class LLViewerJointMesh : public LLViewerJoint
{
+ friend class LLVOAvatar;
protected:
LLColor4 mColor; // color value
// LLColor4 mSpecular; // specular color (always white for now)