diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-11-21 22:16:09 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-11-22 15:38:53 +0200 |
| commit | 3db8ce984690486cf12343745a6330750b27ae0d (patch) | |
| tree | 5d4b1ad285ff49e539ad0eb39f1503b02b311b9a /indra | |
| parent | 6c6b38821ef0ea452b640b31006a8ef4f2dfef55 (diff) | |
viewer#3123 Crash at LLVOTree::updateSpatialExtents
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvotree.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index ed91214bd0..dd1be028cd 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -537,7 +537,6 @@ private: F32 mImagePriority; // should map to max virtual size F32 mRequestedPriority; S32 mDesiredDiscard; - S32 mSimRequestedDiscard; S32 mRequestedDiscard; S32 mLoadedDiscard; S32 mDecodedDiscard; @@ -870,7 +869,6 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher, mImagePriority(priority), mRequestedPriority(0.f), mDesiredDiscard(-1), - mSimRequestedDiscard(-1), mRequestedDiscard(-1), mLoadedDiscard(-1), mDecodedDiscard(-1), diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp index 14b4273b02..cfb15b42c4 100644 --- a/indra/newview/llvotree.cpp +++ b/indra/newview/llvotree.cpp @@ -1167,9 +1167,15 @@ void LLVOTree::updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax) pos.load3(center.mV); mDrawable->setPositionGroup(pos); - LLFace* facep = mDrawable->getFace(0); - facep->mExtents[0] = newMin; - facep->mExtents[1] = newMax; + if (mDrawable->getNumFaces() > 0) + { + LLFace* facep = mDrawable->getFace(0); + if (facep) + { + facep->mExtents[0] = newMin; + facep->mExtents[1] = newMax; + } + } } bool LLVOTree::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, S32 face, bool pick_transparent, bool pick_rigged, bool pick_unselectable, S32 *face_hitp, |