diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-09-21 16:04:12 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-09-21 16:04:12 -0400 |
| commit | 8665dee5f6cca501ec94b33e56c0c4de284fd757 (patch) | |
| tree | 9a3356ac50a7fa084c698092596c6ba3cba59423 /indra/newview/llviewerobject.cpp | |
| parent | a66b5fb8cfc590110bb698d490510d66b6d8b430 (diff) | |
| parent | 2ae5e8db53e6d89e741cda0ce45e8cf65595bd16 (diff) | |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -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 cd71b6d42a..db7bb002c1 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 { @@ -149,9 +150,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: |