Merge branch 'release/2026.01' into project/voice_moderation

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 2ca2454040..6ba31c251e 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -4404,3 +4404,17 @@ bool LLContextMenu::addChild(LLView* view, S32 tab_group)
     return addContextChild(view, tab_group);
 }
 
+void LLContextMenu::deleteAllChildren()
+{
+    mHoverItem = nullptr;
+    LLMenuGL::deleteAllChildren();
+}
+
+void LLContextMenu::removeChild(LLView* ctrl)
+{
+    if (ctrl == mHoverItem)
+    {
+        mHoverItem = nullptr;
+    }
+    LLMenuGL::removeChild(ctrl);
+}