diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
| commit | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (patch) | |
| tree | 623156a93d159ece460a31590701d7cbdc701cdc /indra/newview/lldrawpool.cpp | |
| parent | 610764fbfce75f54c95d4b10c2a8f9482a7a7b80 (diff) | |
| parent | 2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index 286284f828..0c572def72 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -384,7 +384,7 @@ BOOL LLFacePool::LLOverrideFaceColor::sOverrideFaceColor = FALSE; void LLFacePool::LLOverrideFaceColor::setColor(const LLColor4& color) { - glColor4fv(color.mV); + gGL.diffuseColor4fv(color.mV); } void LLFacePool::LLOverrideFaceColor::setColor(const LLColor4U& color) @@ -394,7 +394,7 @@ void LLFacePool::LLOverrideFaceColor::setColor(const LLColor4U& color) void LLFacePool::LLOverrideFaceColor::setColor(F32 r, F32 g, F32 b, F32 a) { - glColor4f(r,g,b,a); + gGL.diffuseColor4f(r,g,b,a); } |