Merge

1 files changed, 12 insertions, 1 deletions

diff --git a/indra/newview/llinspecttoast.cpp b/indra/newview/llinspecttoast.cpp
index d04378daaf..47560341e7 100755
--- a/indra/newview/llinspecttoast.cpp
+++ b/indra/newview/llinspecttoast.cpp
@@ -47,6 +47,7 @@ public:
 
 	/*virtual*/ void onOpen(const LLSD& notification_id);
 	/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
+	/*virtual*/ void removeChild(LLView* child);
 private:
 	void onToastDestroy(LLToast * toast);
 
@@ -98,7 +99,7 @@ void LLInspectToast::onOpen(const LLSD& notification_id)
 	panel->setMouseOpaque(FALSE);
 	if(mPanel != NULL && mPanel->getParent() == this)
 	{
-		removeChild(mPanel);
+		LLInspect::removeChild(mPanel);
 	}
 	addChild(panel);
 	panel->setFocus(TRUE);
@@ -121,6 +122,16 @@ BOOL LLInspectToast::handleToolTip(S32 x, S32 y, MASK mask)
 	return LLFloater::handleToolTip(x, y, mask);
 }
 
+// virtual
+void LLInspectToast::removeChild(LLView* child)
+{
+	if (mPanel == child)
+	{
+		mPanel = NULL;
+	}
+	LLInspect::removeChild(child);
+}
+
 void LLInspectToast::onToastDestroy(LLToast * toast)
 {
 	closeFloater(false);