diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-04-26 16:38:47 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-04-26 16:38:47 -0500 |
| commit | a00a569ac85b5a9e3198444eee9919af4e7e4a72 (patch) | |
| tree | 4319d66cee0da1178c28ed42d2ccf2a80a32a912 /indra/newview/llvieweroctree.cpp | |
| parent | 436544a51a99da007cdb702cee338ffb85da85a5 (diff) | |
SL-17276 Potential fix for crash on shutdown on mac.
Diffstat (limited to 'indra/newview/llvieweroctree.cpp')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 5eda75753e..87e296012d 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -1325,8 +1325,13 @@ LLViewerOctreePartition::LLViewerOctreePartition() : LLViewerOctreePartition::~LLViewerOctreePartition() { - delete mOctree; - mOctree = NULL; + cleanup(); +} + +void LLViewerOctreePartition::cleanup() +{ + delete mOctree; + mOctree = nullptr; } BOOL LLViewerOctreePartition::isOcclusionEnabled() @@ -1334,6 +1339,7 @@ BOOL LLViewerOctreePartition::isOcclusionEnabled() return mOcclusionEnabled || LLPipeline::sUseOcclusion > 2; } + //----------------------------------------------------------------------------------- //class LLViewerOctreeCull definitions //----------------------------------------------------------------------------------- |