livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-14119 Crash at LLVolumeFace::cacheOptimize

meow-7.2.2
Andrey Kleshchev 2020-10-14 11:47:54 +03:00
parent 131996176f
commit 8a64ded50f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llinventory/llinventory.h
View File

@ -247,7 +247,7 @@ public:
LLInventoryCategory(const LLInventoryCategory* other);
void copyCategory(const LLInventoryCategory* other); // LLRefCount requires custom copy
protected:
~LLInventoryCategory();
virtual ~LLInventoryCategory();
//--------------------------------------------------------------------
// Accessors And Mutators

6
indra/llmath/llvolume.cpp
View File

@ -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)
{