diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 17:34:07 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 17:34:07 -0400 |
| commit | d6b8b49f7f74bf8c503fac7db8e0f47a87f5a9a0 (patch) | |
| tree | 91dc6f689ded236959ecffcebfa4534fd69a5c57 | |
| parent | 50896aafe53759ed0b5b8bcd4a835957dd2a0e4f (diff) | |
| parent | 77eb3aae04b276369aea70d2931f6aed7352d823 (diff) | |
merge
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerobject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index c5c841d666..46e4fc3b02 100644..100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -139,6 +139,7 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco if (!gAgentAvatarp) { gAgentAvatarp = new LLVOAvatarSelf(id, pcode, regionp); + gAgentAvatarp->initInstance(); } else { @@ -148,9 +149,10 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco } else { - res = new LLVOAvatar(id, pcode, regionp); + LLVOAvatar *avatar = new LLVOAvatar(id, pcode, regionp); + avatar->initInstance(); + res = avatar; } - static_cast<LLVOAvatar*>(res)->initInstance(); break; } case LL_PCODE_LEGACY_GRASS: |