Merge pull request #5539 from secondlife/marchcat/slua-26.1-webrtc

26.1 -> SLua PV merge

2 files changed, 16 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);
+}
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index eacf2c59d4..bca0a731fc 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -730,6 +730,8 @@ public:
     virtual bool    handleRightMouseUp  ( S32 x, S32 y, MASK mask );
 
     virtual bool    addChild            (LLView* view, S32 tab_group = 0);
+    /*virtual*/ void deleteAllChildren();
+    /*virtual*/ void removeChild(LLView* ctrl);
 
             LLHandle<LLContextMenu> getHandle() { return getDerivedHandle<LLContextMenu>(); }