summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-02-01 23:24:42 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-02-01 23:33:41 +0200
commit44b6459dfaa4f1605fdbcb7e07ac03b9d057d603 (patch)
treec88886947e37c44b9a13db83a0c8115aea8d303f /indra/llmath
parentd3169aa696f5afaff18eb4d90c8b70a4f5528eb7 (diff)
parent21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff)
Merge branch 'master' into DRTVWR-514-keymappings
# Conflicts: # indra/llui/llscrolllistctrl.cpp
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llvolume.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 7da53bf8c8..e085fa6ada 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -5241,9 +5241,9 @@ public:
LLVCacheTriangleData* tri = *iter;
if (tri->mActive)
{
- tri->mScore = tri->mVertex[0]->mScore;
- tri->mScore += tri->mVertex[1]->mScore;
- tri->mScore += tri->mVertex[2]->mScore;
+ tri->mScore = tri->mVertex[0] ? tri->mVertex[0]->mScore : 0;
+ tri->mScore += tri->mVertex[1] ? tri->mVertex[1]->mScore : 0;
+ tri->mScore += tri->mVertex[2] ? tri->mVertex[2]->mScore : 0;
if (!mBestTriangle || mBestTriangle->mScore < tri->mScore)
{