summaryrefslogtreecommitdiff
path: root/indra/llappearance/llavatarjointmesh.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-09-13 22:14:53 +0000
committerDon Kjer <don@lindenlab.com>2012-09-13 22:14:53 +0000
commit5bb8962c4e2e1ca12d637fcddc02a78f5ecf7225 (patch)
treece95886fb4163fccef9df045bfe6b0088de4ffc8 /indra/llappearance/llavatarjointmesh.cpp
parent8ba2b388769e245ec1b49b7d6d4b0372d684ff86 (diff)
parentb4866775a2acc98ebcb3986d7779eea479028ff9 (diff)
Merge sunshine -> sunshine-experimental
Diffstat (limited to 'indra/llappearance/llavatarjointmesh.cpp')
-rwxr-xr-xindra/llappearance/llavatarjointmesh.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llappearance/llavatarjointmesh.cpp b/indra/llappearance/llavatarjointmesh.cpp
index d39587defe..c611ab7cec 100755
--- a/indra/llappearance/llavatarjointmesh.cpp
+++ b/indra/llappearance/llavatarjointmesh.cpp
@@ -208,6 +208,11 @@ void LLAvatarJointMesh::setColor( F32 red, F32 green, F32 blue, F32 alpha )
mColor[3] = alpha;
}
+void LLAvatarJointMesh::setColor( const LLColor4& color )
+{
+ mColor = color;
+}
+
//--------------------------------------------------------------------
// LLAvatarJointMesh::getTexture()