diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-18 11:55:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-18 11:55:30 -0700 |
| commit | 6393e88ca47998fc5dfae3ce2fc2fd41bf568f49 (patch) | |
| tree | a0c17d1b8e499740934f88780b2043e264eab078 /indra/newview/llviewerregion.cpp | |
| parent | d0dfffe659b24f5a6bfadc5cc612869e1f08bb93 (diff) | |
| parent | 4e593dcded0ab1cc033a9be4d0489d12a8305a7e (diff) | |
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
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 87eddefcba..19a1990665 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; } |