diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-26 14:20:04 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-26 14:20:04 -0700 |
| commit | 3dff18eb6981dec4231437b5fd67a4f7e6b4d9a2 (patch) | |
| tree | f6d984b525b2dc279c842aa0d4b0db082f53b419 /indra/newview/llvoavatar.cpp | |
| parent | 8f02fc8a66c51df6d71d1d04020f283c0fcb1a24 (diff) | |
Fix merged code use of obsoleted vars and other merge errors.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 5584efeb7b..7a79bd996f 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2952,7 +2952,7 @@ void LLVOAvatar::idleUpdateLoadingEffect() void LLVOAvatar::idleUpdateWindEffect() { // update wind effect - if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) >= LLDrawPoolAvatar::SHADER_LEVEL_CLOTH)) + if ((LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) >= LLDrawPoolAvatar::SHADER_LEVEL_CLOTH)) { F32 hover_strength = 0.f; F32 time_delta = mRippleTimer.getElapsedTimeF32() - mRippleTimeLast; @@ -4654,7 +4654,7 @@ U32 LLVOAvatar::renderSkinned() } } - if (LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) <= 0) + if (LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) <= 0) { if (mNeedsSkin) { |