diff options
author | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
commit | c5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch) | |
tree | c2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /indra/llui/llview.cpp | |
parent | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff) | |
parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) |
DRTVWR-489: trivial merge conflict fix
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 2b7f05dcda..8716e6b338 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(); } } |