diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/lltoolmorph.cpp | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
| -rw-r--r-- | indra/newview/lltoolmorph.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index 75e19645a6..af0d784a3e 100644 --- a/indra/newview/lltoolmorph.cpp +++ b/indra/newview/lltoolmorph.cpp @@ -56,13 +56,12 @@ #include "llsky.h" #include "lltexlayer.h" #include "lltoolmgr.h" -#include "lltoolview.h" #include "llui.h" #include "llviewercamera.h" #include "llviewerimagelist.h" #include "llviewerobject.h" #include "llviewerwindow.h" -#include "llvoavatar.h" +#include "llvoavatarself.h" #include "pipeline.h" @@ -145,7 +144,7 @@ BOOL LLVisualParamHint::needsRender() void LLVisualParamHint::preRender(BOOL clear_depth) { - LLVOAvatar* avatarp = gAgent.getAvatarObject(); + LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); mLastParamWeight = avatarp->getVisualParamWeight(mVisualParam); avatarp->setVisualParamWeight(mVisualParam, mVisualParamWeight); @@ -292,7 +291,7 @@ BOOL LLVisualParamReset::render() { if (sDirty) { - LLVOAvatar* avatarp = gAgent.getAvatarObject(); + LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); avatarp->updateComposites(); avatarp->updateVisualParams(); avatarp->updateGeometry(avatarp->mDrawable); |