From e6da5a4bbaaefa81a058087ddc567caa459b58b7 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 13 Sep 2011 18:05:44 -0400 Subject: SH-2353 FIX selection streaming cost always says 0.0 PE found that the streaming cost function definition wasn't lining up with its inherited function definition. Fixed the inhereted funciton definition to add the new parameter. Selection streaming cost works again, though client-side generated. Should probably depricate/remove this feature. --- indra/newview/llviewerobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewerobject.cpp') diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d20b6641d3..c5c841d666 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3217,7 +3217,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; } -- cgit v1.2.3 From 832ed49f5bb6683323be0ababf8984b2f0701108 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 16 Sep 2011 13:03:10 -0400 Subject: SH-2440 FIX - avoid calling initInstance() on LLVOAvatarSelf if it already exists --- indra/newview/llviewerobject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 indra/newview/llviewerobject.cpp (limited to 'indra/newview/llviewerobject.cpp') diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp old mode 100644 new mode 100755 index cd71b6d42a..99a641844f --- 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(res)->initInstance(); break; } case LL_PCODE_LEGACY_GRASS: -- cgit v1.2.3 From 77eb3aae04b276369aea70d2931f6aed7352d823 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 16 Sep 2011 13:14:30 -0400 Subject: SH-2440 FIX - first build, then test, then commit --- indra/newview/llviewerobject.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerobject.cpp') diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 99a641844f..db7bb002c1 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -150,8 +150,9 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco } else { - res = new LLVOAvatar(id, pcode, regionp); - res->initInstance(); + LLVOAvatar *avatar = new LLVOAvatar(id, pcode, regionp); + avatar->initInstance(); + res = avatar; } break; } -- cgit v1.2.3