diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-08-11 17:17:22 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-08-11 17:17:22 +0300 |
| commit | fe73c67168ef597e04fdc6fe230d4724cc9497c3 (patch) | |
| tree | a391c1a76e2bdf9ee9edded3670929029162d0d4 | |
| parent | 9ac1a63a41d6d8d9819519aee8c0326cf40d01a7 (diff) | |
SL-15798 Crash in clearCachedVisibleObjects
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 7628a6c7ef..4c7868cbe5 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1439,7 +1439,12 @@ void LLViewerRegion::clearCachedVisibleObjects() for(LLVOCacheEntry::vocache_entry_set_t::iterator iter = mImpl->mActiveSet.begin(); iter != mImpl->mActiveSet.end(); ++iter) { - LLDrawable* drawablep = (LLDrawable*)(*iter)->getEntry()->getDrawable(); + LLVOCacheEntry* vo_entry = *iter; + if (!vo_entry || !vo_entry->getEntry()) + { + continue; + } + LLDrawable* drawablep = (LLDrawable*)vo_entry->getEntry()->getDrawable(); if(drawablep && !drawablep->getParent()) { |