diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-18 11:48:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-18 11:48:37 -0700 |
| commit | 4e593dcded0ab1cc033a9be4d0489d12a8305a7e (patch) | |
| tree | eb12b6af64b6da0444776034025fec9141ce41ce /indra/newview/llviewerregion.cpp | |
| parent | 3da16d1899324b358ac0d27ddd99bf8214f6fb54 (diff) | |
| parent | 7342ebf43aa7500afe7410b49689a3aefa669e58 (diff) | |
Merge pull request #1797 from secondlife/release/maint-a
merge release/maint-a into develop and close maint-a
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index e8a9f41855..b5b127b27a 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2854,7 +2854,11 @@ bool LLViewerRegion::probeCache(U32 local_id, U32 crc, U32 flags, U8 &cache_miss if(entry->isState(LLVOCacheEntry::ACTIVE)) { - ((LLDrawable*)entry->getEntry()->getDrawable())->getVObj()->loadFlags(flags); + LLDrawable* drawable = (LLDrawable*)entry->getEntry()->getDrawable(); + if (drawable && drawable->getVObj()) + { + drawable->getVObj()->loadFlags(flags); + } return true; } |