diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-27 08:10:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-27 08:10:29 -0400 |
commit | 5ed8ec6ca45fcae6a6708e55326010fd8c05d76c (patch) | |
tree | 433af79631cf0f386c6cf991cb01e119d5187009 /indra/newview/llviewerjointmesh.h | |
parent | a4913246770b58ed569021c484c213231aaae549 (diff) | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) |
merge up to 3.3.3-release
Diffstat (limited to 'indra/newview/llviewerjointmesh.h')
-rw-r--r-- | indra/newview/llviewerjointmesh.h | 1 |
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) |