diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-21 16:50:04 -0800 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-21 16:50:04 -0800 |
| commit | 2fd0e6e8f9cea68fbfe77282d623e70c64b52469 (patch) | |
| tree | 58209b1da794413be879b10e7444ced701f5adf1 /indra/llrender/llrender.h | |
| parent | 69133ca4e318fc93fed39589c9221251440bcb96 (diff) | |
Merge viewer-cat and resolve conflict with alternate self
Diffstat (limited to 'indra/llrender/llrender.h')
| -rw-r--r-- | 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 78a310e525..90b1ec2f57 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -388,6 +388,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); |