diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-12 17:05:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 17:05:23 +0300 |
| commit | 9bc190c8d3ddd7a692636bb349952144fd511622 (patch) | |
| tree | 07b0a9297a67667b5c85c4eb4950628e344c5106 /indra/newview/llspatialpartition.cpp | |
| parent | f5a7fba76a24a96f906abcbd928f37e4eabfa76c (diff) | |
| parent | eab5beb54cacc2b0dc2cddad4a78634e7468a298 (diff) | |
Merge pull request #1211 from secondlife/marchcat/x-merge
Release (Maint W) -> Maint X merge
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 2ecdf75e29..f7c15dde1a 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -854,10 +854,9 @@ void LLSpatialGroup::rebound() LLControlAvatar* controlAvatar = bridge->mDrawable->getVObj()->getControlAvatar(); if (controlAvatar && controlAvatar->mDrawable && - controlAvatar->mControlAVBridge) + controlAvatar->mControlAVBridge && + controlAvatar->mControlAVBridge->mOctree) { - llassert(controlAvatar->mControlAVBridge->mOctree); - LLSpatialGroup* root = (LLSpatialGroup*)controlAvatar->mControlAVBridge->mOctree->getListener(0); if (this == root) { |