diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
| commit | 5797711cbdb553b39e6bc6ad7d9250e3208e5633 (patch) | |
| tree | 5071e15e3240c3e39fe42a26f4c45bd63ccb381a /indra/llui/llview.cpp | |
| parent | a0089c432ac9008f5d2f7ef2a332afa10c5a2615 (diff) | |
| parent | f9f5b538b21ae57f34009b36d4831d2a7000c20c (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 9ba71913d0..3344300635 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -576,8 +576,10 @@ void LLView::deleteAllChildren() while (!mChildList.empty()) { - LLView* viewp = mChildList.front(); - delete viewp; // will remove the child from mChildList + LLView* viewp = mChildList.front(); + viewp->mParentView = NULL; + delete viewp; + mChildList.pop_front(); } } |