diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-22 14:45:04 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-22 14:45:04 -0400 |
| commit | 75b2f617893f5712817f28282e517d3f70861613 (patch) | |
| tree | 4855a804730982616fac17a92e23b902cfa7fb12 /indra/newview/llviewerobject.cpp | |
| parent | 2091ce3ae745b15c979e78f853eb0d1777efff18 (diff) | |
| parent | 812b6c60edbdae57cbe77b9c60c74a4bcbaf24ca (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerobject.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d20b6641d3..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: @@ -3217,7 +3219,7 @@ F32 LLViewerObject::getLinksetPhysicsCost() return mLinksetPhysicsCost; } -F32 LLViewerObject::getStreamingCost(S32* bytes, S32* visible_bytes) +F32 LLViewerObject::getStreamingCost(S32* bytes, S32* visible_bytes, F32* unscaled_value) const { return 0.f; } |