From 206ef7a1562db19a4d8a41e55b7272c917f4b62c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 25 Aug 2015 17:51:35 -0400 Subject: MAINT-5560: Correct imposter rendering flaws for avatars that have not had any attachments --- indra/newview/llspatialpartition.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/newview/llspatialpartition.cpp') diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 5e342099d7..11b619ba00 100755 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -862,10 +862,8 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node) { if (bridge->mAvatar.notNull()) { - bridge->mAvatar->mAttachmentGeometryBytes -= mGeometryBytes; - bridge->mAvatar->mAttachmentGeometryBytes = llmax(bridge->mAvatar->mAttachmentGeometryBytes, 0); - bridge->mAvatar->mAttachmentSurfaceArea -= mSurfaceArea; - bridge->mAvatar->mAttachmentSurfaceArea = llmax(bridge->mAvatar->mAttachmentSurfaceArea, 0.f); + bridge->mAvatar->modifyAttachmentGeometryBytes( -mGeometryBytes ); + bridge->mAvatar->modifyAttachmentSurfaceArea( -mSurfaceArea ); } } -- cgit v1.2.3 From 712a4e70c81c1908e4e7668ff1695a9415ec4b71 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 26 Aug 2015 12:07:16 -0400 Subject: refine fix for MAINT-5560 based on review feedback and to fix VS objection --- indra/newview/llspatialpartition.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llspatialpartition.cpp') diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 11b619ba00..da3f344e00 100755 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -862,8 +862,7 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node) { if (bridge->mAvatar.notNull()) { - bridge->mAvatar->modifyAttachmentGeometryBytes( -mGeometryBytes ); - bridge->mAvatar->modifyAttachmentSurfaceArea( -mSurfaceArea ); + bridge->mAvatar->subtractAttachmentSizes( mGeometryBytes, mSurfaceArea ); } } -- cgit v1.2.3 From ca7631e4d71c693a5a502c05a482ab01ada7888a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 1 Mar 2016 16:01:21 -0500 Subject: MAINT-6183: Remove geometry bytes as a trigger for muted/impostor rendering --- indra/newview/llspatialpartition.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llspatialpartition.cpp') diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index bee57d595b..b0eb4137a7 100755 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -862,7 +862,7 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node) { if (bridge->mAvatar.notNull()) { - bridge->mAvatar->subtractAttachmentSizes( mGeometryBytes, mSurfaceArea ); + bridge->mAvatar->subtractAttachmentArea(mSurfaceArea ); } } -- cgit v1.2.3