diff options
| author | Martin Reddy <lynx@lindenlab.com> | 2009-09-25 16:51:25 +0000 |
|---|---|---|
| committer | Martin Reddy <lynx@lindenlab.com> | 2009-09-25 16:51:25 +0000 |
| commit | b5724bc0e97328a1859fc52b444e0a2edec255dd (patch) | |
| tree | f19d1df1b3d3baff6870e87040afbc0f2b738195 /indra/newview/llface.cpp | |
| parent | af774fc9dbfd8550d61981b49151b60a7eaade91 (diff) | |
SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
fixes all of the parentheses warnings in the code.
Original patch was reviewed by merov (and others).
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 8aea7422fc..fc5b27dd1b 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1007,7 +1007,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, 0.75f }; - if (getPoolType() != LLDrawPool::POOL_ALPHA && (LLPipeline::sRenderDeferred || LLPipeline::sRenderBump && tep->getShiny())) + if (getPoolType() != LLDrawPool::POOL_ALPHA && (LLPipeline::sRenderDeferred || (LLPipeline::sRenderBump && tep->getShiny()))) { color.mV[3] = U8 (alpha[tep->getShiny()] * 255); } |