diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 13:03:10 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-16 13:03:10 -0400 |
| commit | 832ed49f5bb6683323be0ababf8984b2f0701108 (patch) | |
| tree | d388ce1f19bac6ddca74a826ac0f53595ab4cba3 /indra/newview/llviewerobject.cpp | |
| parent | 1a0865a57220434a49b106a47170c3dae45dcb13 (diff) | |
SH-2440 FIX - avoid calling initInstance() on LLVOAvatarSelf if it already exists
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index cd71b6d42a..99a641844f 100644..100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -140,6 +140,7 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco if (!gAgentAvatarp) { gAgentAvatarp = new LLVOAvatarSelf(id, pcode, regionp); + gAgentAvatarp->initInstance(); } else { @@ -150,8 +151,8 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco else { res = new LLVOAvatar(id, pcode, regionp); + res->initInstance(); } - static_cast<LLVOAvatar*>(res)->initInstance(); break; } case LL_PCODE_LEGACY_GRASS: |