diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2008-06-30 17:57:00 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2008-06-30 17:57:00 +0000 |
| commit | 939a506569433db7bff96c12200f03b3f85f40de (patch) | |
| tree | c9f308949400b0a4ce00c82a6a33f2868e31a1d1 /indra/newview/llvoavatar.cpp | |
| parent | 1a14cd34a9a4e6f51c445d477aaeeef0322d5853 (diff) | |
Merging in file-move-merge ( QAR-649 )
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."
Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index cf2c094ded..287f063757 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -114,7 +114,7 @@ #include "llworld.h" #include "pipeline.h" #include "llspatialpartition.h" -#include "llglslshader.h" +#include "llviewershadermgr.h" #include "llappviewer.h" #include "llsky.h" #include "llanimstatelabels.h" @@ -2824,7 +2824,7 @@ void LLVOAvatar::idleUpdateLoadingEffect() void LLVOAvatar::idleUpdateWindEffect() { // update wind effect - if ((LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR) >= LLDrawPoolAvatar::SHADER_LEVEL_CLOTH)) + if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) >= LLDrawPoolAvatar::SHADER_LEVEL_CLOTH)) { F32 hover_strength = 0.f; F32 time_delta = mRippleTimer.getElapsedTimeF32() - mRippleTimeLast; @@ -3388,7 +3388,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) return FALSE; } } - + // change animation time quanta based on avatar render load if (!mIsSelf && !mIsDummy) { @@ -4000,7 +4000,7 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass) mDrawable->clearState(LLDrawable::REBUILD_GEOMETRY); } - if (LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR) <= 0) + if (LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_AVATAR) <= 0) { if (mNeedsSkin) { @@ -9714,7 +9714,7 @@ BOOL LLVOAvatar::updateLOD() } updateVisibility(); - + return res; } |