diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-08-13 19:36:16 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-08-13 19:36:16 -0500 |
| commit | bd0b3a2ddeafaf0d1669ede7ab5aee22d8da9af7 (patch) | |
| tree | f2f67d130ff4422693ca27d3b3d3c632561afe6d /indra/llrender | |
| parent | 671609239f63bc6dc293a0580e6f1b8e48239b26 (diff) | |
| parent | 9d5a3d7a2d830c07dd6b79534fdbe7c782b30afe (diff) | |
merge
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 0f54ebeb69..9eb5668d88 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -234,7 +234,14 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader) else if (features->isFullbright) { - if (features->hasWaterFog) + if (features->isShiny && features->hasWaterFog) + { + if (!shader->attachObject("lighting/lightFullbrightShinyWaterF.glsl")) + { + return FALSE; + } + } + else if (features->hasWaterFog) { if (!shader->attachObject("lighting/lightFullbrightWaterF.glsl")) { |