diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
| commit | baa73fddd9287ddafd2d31551cb253b355ed910a (patch) | |
| tree | e3f0986617fe6c0ee0a14df6aac13c6bb6f92507 /indra/newview/llmorphview.cpp | |
| parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
| parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) | |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/llmorphview.cpp')
| -rw-r--r-- | indra/newview/llmorphview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp index 0e49ecd9b5..f562e45770 100644 --- a/indra/newview/llmorphview.cpp +++ b/indra/newview/llmorphview.cpp @@ -47,7 +47,7 @@ #include "lltoolmgr.h" #include "lltoolmorph.h" #include "llviewercamera.h" -#include "llvoavatar.h" +#include "llvoavatarself.h" #include "llviewerwindow.h" #include "pipeline.h" @@ -108,7 +108,7 @@ void LLMorphView::initialize() //----------------------------------------------------------------------------- void LLMorphView::shutdown() { - LLVOAvatar::onCustomizeEnd(); + LLVOAvatarSelf::onCustomizeEnd(); LLVOAvatar *avatarp = gAgent.getAvatarObject(); if(avatarp && !avatarp->isDead()) |