summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-04-27 20:16:16 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-04-27 20:16:16 +0100
commit09f40ee736f43781d5048cdd6883b8801a9ef448 (patch)
tree1fe1cb3b2ab55e3acf5659bb5df156a6f13456fb
parent19ebe40974edc23b9ac00e80dc716e34cad5a65d (diff)
MAINT-8575 - ignore sitting avatars when totalling tris for animated objects
-rw-r--r--indra/newview/llviewerobject.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index bde38029d0..11d64ab13a 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3663,7 +3663,10 @@ F32 LLViewerObject::recursiveGetEstTrianglesMax() const
iter != mChildList.end(); iter++)
{
const LLViewerObject* child = *iter;
- est_tris += child->recursiveGetEstTrianglesMax();
+ if (!child->isAvatar())
+ {
+ est_tris += child->recursiveGetEstTrianglesMax();
+ }
}
return est_tris;
}