From c4610214fc46639cb3766f7c0f52f181c4bec909 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Wed, 31 Jul 2013 01:36:29 -0400
Subject: [PATCH] Prevent that annoying issue where new scroll list menu
 flashes in the bottom left corner briefly when created.\

---
 indra/llui/llscrolllistctrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index e0c0cb1e0..f76b21762 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1742,6 +1742,7 @@ BOOL LLScrollListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	}
 	gFocusMgr.setKeyboardFocus(this); // Menu listeners rely on this
 	mPopupMenu->buildDrawLabels();
+	mPopupMenu->updateParent(LLMenuGL::sMenuContainer);
 	LLMenuGL::showPopup(this, mPopupMenu, x, y);
 	return TRUE;
 }
@@ -2556,7 +2557,6 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
 		std::string menu_file;
 		node->getAttributeString("menu_file", menu_file);
 		mPopupMenu = LLUICtrlFactory::getInstance()->buildMenu(menu_file, LLMenuGL::sMenuContainer);
-		LLMenuGL::sMenuContainer->addChild(mPopupMenu);
 	}
 }