diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-19 16:57:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-19 16:57:20 -0400 |
| commit | 9ac33479aa2fa2a0ad7ec5903bc364a07d1a8c74 (patch) | |
| tree | 9334c1a5d4ba38b06e84518e73c8305918d65cd0 /indra/newview | |
| parent | aa45b6e480f7ebed09ebaae9584c2cb969b4e968 (diff) | |
| parent | 77eb3aae04b276369aea70d2931f6aed7352d823 (diff) | |
merge changes for storm-1609
Diffstat (limited to 'indra/newview')
| -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: |