diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-27 20:55:00 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-27 20:55:00 +0200 |
| commit | 18e96f5264fcdf56e2c6b2a67e1e63a8506a242f (patch) | |
| tree | 67abe5d534cd0ff6dc8c6ee06c5d6c102619d381 /indra/newview/llworld.cpp | |
| parent | 20be54210f17db8499a234760b0eef91fb962731 (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Merge branch 'main' into DRTVWR-579-texture-preview
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 55bcbf8aa5..871583e071 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -293,13 +293,13 @@ void LLWorld::removeRegion(const LLHost &host) mRegionRemovedSignal(regionp); - delete regionp; - updateWaterObjects(); //double check all objects of this region are removed. gObjectList.clearAllMapObjectsInRegion(regionp) ; //llassert_always(!gObjectList.hasMapObjectInRegion(regionp)) ; + + delete regionp; // Delete last to prevent use after free } |