diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-09 12:37:41 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-09 12:37:41 +0800 |
| commit | 381fecfd3e6f724ba0d3ae73ff6b1645521681e9 (patch) | |
| tree | 19d621c92d8ecdeae7cbea3b6bedbc367febf9bb /indra/newview/lldrawable.cpp | |
| parent | 38e93309358700deb15b6b32b6395d1bc08e5525 (diff) | |
| parent | 632a8648ca5456448499a96dcc58c40f4ff80d95 (diff) | |
Merge tag 'Second_Life_Release#632a8648-2025.03' into 2025.03
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 4921964b35..9d212cfe8b 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -253,7 +253,15 @@ void LLDrawable::cleanupReferences() std::for_each(mFaces.begin(), mFaces.end(), DeletePointer()); mFaces.clear(); - gPipeline.unlinkDrawable(this); + if (gPipeline.mInitialized) + { + gPipeline.unlinkDrawable(this); + } + else if (getSpatialGroup()) + { + // Not supposed to happen? + getSpatialGroup()->getSpatialPartition()->remove(this, getSpatialGroup()); + } removeFromOctree(); |