diff options
author | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
commit | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (patch) | |
tree | adeadd5ef0b8c4514b325f74c3426b2af76e422b /indra/llrender/llrender.h | |
parent | f53b2bd880875b5194b6d298e1aad7d8951db9f3 (diff) | |
parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) |
Pull merge of lindenlab/viewer-release
Diffstat (limited to 'indra/llrender/llrender.h')
-rwxr-xr-x | indra/llrender/llrender.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 98222939e7..42b02a8159 100755 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -396,6 +396,7 @@ public: void diffuseColor4f(F32 r, F32 g, F32 b, F32 a); void diffuseColor4fv(const F32* c); void diffuseColor4ubv(const U8* c); + void diffuseColor4ub(U8 r, U8 g, U8 b, U8 a); void vertexBatchPreTransformed(LLVector3* verts, S32 vert_count); void vertexBatchPreTransformed(LLVector3* verts, LLVector2* uvs, S32 vert_count); |