diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-10-14 11:47:54 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-10-14 11:48:07 +0300 |
| commit | 8a64ded50f3d168d5ffc9df49c41a572c3439b43 (patch) | |
| tree | 12c3de2e41ba144a38489e265ca490d90ee0609d | |
| parent | 131996176f647e710bf4625cc2f93a631be9bcb2 (diff) | |
SL-14119 Crash at LLVolumeFace::cacheOptimize
| -rw-r--r-- | indra/llinventory/llinventory.h | 2 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 70b200e139..96659cd602 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -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 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) { |