diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-22 06:03:42 -0400 |
commit | 7637acf76e6a1170508e8bddd381c426d219b1ee (patch) | |
tree | c48b5ea58fda587a103278860b943122f6ce8fae /indra/newview/llviewerjointmesh.h | |
parent | 6525fc4a4fc09e02c4fa709e0cbba4aa8d7d25ae (diff) | |
parent | c4dfdcb338aaeeb4e3adc4e1aef4f5b190ef5c57 (diff) |
merge changes for DRTVWR-149
Diffstat (limited to 'indra/newview/llviewerjointmesh.h')
-rwxr-xr-x[-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..100755 --- 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) |