From 001621dfc21942a6ae0075ca3eef31720f42477b Mon Sep 17 00:00:00 2001
From: Stinson Linden <stinson@lindenlab.com>
Date: Mon, 5 May 2014 23:24:34 +0100
Subject: MAINT-4009: Patching a small memory leak for when menu items were
 being created before the viewer window initialization had created the menu
 holder.  Also, added llasserts in other cases when referencing the menu
 holder to ensure the holder is non-null.

---
 indra/llui/lltexteditor.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llui/lltexteditor.cpp')

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 494666df8a..517142bf17 100755
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2031,6 +2031,7 @@ void LLTextEditor::showContextMenu(S32 x, S32 y)
 {
 	if (!mContextMenu)
 	{
+		llassert(LLMenuGL::sMenuContainer != NULL);
 		mContextMenu = LLUICtrlFactory::instance().createFromFile<LLContextMenu>("menu_text_editor.xml", 
 																				LLMenuGL::sMenuContainer, 
 																				LLMenuHolderGL::child_registry_t::instance());
-- 
cgit v1.2.3