summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2019-12-16 12:47:19 -0700
committerDave Houlton <euclid@lindenlab.com>2019-12-16 12:47:19 -0700
commitf61a5c4642db8af5d80eacc0ca7a2062bf08e4f0 (patch)
treee644e1db27f9ea9043d4adeeafc3da5ebdd8e211 /indra/llmath
parentbc06a9acf91035903d497bdd66e9bb26859616be (diff)
parentd656d49a77eeb65ae537c954ea4009bc22da7b2b (diff)
Merge viewer-release 6.3.6 into viewwer-eep repo
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llvolume.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index df867b332d..2ac1eb99ce 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2418,7 +2418,7 @@ bool LLVolume::unpackVolumeFaces(std::istream& is, S32 size)
if (idx.empty() || face.mNumIndices < 3)
{ //why is there an empty index list?
- LL_WARNS() <<"Empty face present!" << LL_ENDL;
+ LL_WARNS() << "Empty face present! Face index: " << i << " Total: " << face_count << LL_ENDL;
continue;
}
@@ -5272,7 +5272,7 @@ bool LLVolumeFace::cacheOptimize()
LLVCacheLRU cache;
- if (mNumVertices < 3)
+ if (mNumVertices < 3 || mNumIndices < 3)
{ //nothing to do
return true;
}