Second Life viewer sources 1.18.6.1-RC

1 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 3c29cfd..9b3808f 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5825,7 +5825,8 @@ bool LLObjectSelection::applyToTEs(LLSelectedTEFunctor* func, bool firstonly)
                 iterator nextiter = iter++;
                 LLSelectNode* node = *nextiter;
                 LLViewerObject* object = (*nextiter)->getObject();
-                for (S32 te = 0; te < object->getNumTEs(); ++te)
+                S32 num_tes = llmin((S32)object->getNumTEs(), (S32)object->getNumFaces()); // avatars have TEs but no faces
+                for (S32 te = 0; te < num_tes; ++te)
                 {
                         if (node->isTESelected(te))
                         {