diff options
author | Graham Linden <graham@lindenlab.com> | 2019-02-21 17:20:53 -0800 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-02-21 17:20:53 -0800 |
commit | 7989df1c3623f9402248aa74bdec20dff6d78fd1 (patch) | |
tree | fc313598e69b063c5c86ca119762f331921e3824 /indra/newview/llviewershadermgr.cpp | |
parent | 788a108384a27abf343a1e9ebf5f2437a75552a2 (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 8a69376fe1..a81b20747d 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -3400,9 +3400,9 @@ BOOL LLViewerShaderMgr::loadShadersObject() BOOL LLViewerShaderMgr::loadShadersAvatar() { - BOOL success = TRUE; + BOOL success = TRUE; - if (mShaderLevel[SHADER_AVATAR] == 0) + if (mShaderLevel[SHADER_AVATAR] == 0) { gAvatarProgram.unload(); gAvatarWaterProgram.unload(); @@ -3411,7 +3411,7 @@ BOOL LLViewerShaderMgr::loadShadersAvatar() return TRUE; } - if (success) + if (success) { gAvatarProgram.mName = "Avatar Shader"; gAvatarProgram.mFeatures.hasSkinning = true; @@ -3455,7 +3455,7 @@ BOOL LLViewerShaderMgr::loadShadersAvatar() } } - if (success) + if (success) { gAvatarPickProgram.mName = "Avatar Pick Shader"; gAvatarPickProgram.mFeatures.hasSkinning = true; |