From a7e1243c576d0d41c87de8e444c72037cf5b7e2d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 23 Mar 2015 23:52:53 +0100
Subject: [PATCH] FIRE-15763: Right clicking on navigation bar not displaying
 all menu options

---
 indra/llui/lllineeditor.cpp | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index db04af7f98..aed0c191e2 100755
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -193,14 +193,12 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
 	setPrevalidateInput(p.prevalidate_input_callback());
 	setPrevalidate(p.prevalidate_callback());
 
-	// <FS:Zi> Only allocate a menu when it's called for the first time
-	// llassert(LLMenuGL::sMenuContainer != NULL);
-	// LLContextMenu* menu = LLUICtrlFactory::instance().createFromFile<LLContextMenu>
-	// 	("menu_text_editor.xml",
-	// 	 LLMenuGL::sMenuContainer,
-	// 	 LLMenuHolderGL::child_registry_t::instance());
-	// setContextMenu(menu);
-	// </FS:Zi>
+	llassert(LLMenuGL::sMenuContainer != NULL);
+	LLContextMenu* menu = LLUICtrlFactory::instance().createFromFile<LLContextMenu>
+		("menu_text_editor.xml",
+		 LLMenuGL::sMenuContainer,
+		 LLMenuHolderGL::child_registry_t::instance());
+	setContextMenu(menu);
 }
  
 LLLineEditor::~LLLineEditor()
@@ -2668,18 +2666,6 @@ void LLLineEditor::showContextMenu(S32 x, S32 y)
 {
 	LLContextMenu* menu = static_cast<LLContextMenu*>(mContextMenuHandle.get());
 
-	// <FS:Zi> Only allocate a menu when it's called for the first time
-	if(!menu)
-	{
-		llassert(LLMenuGL::sMenuContainer != NULL);
-		menu = LLUICtrlFactory::instance().createFromFile<LLContextMenu>
-			("menu_text_editor.xml",
-			LLMenuGL::sMenuContainer,
-			LLMenuHolderGL::child_registry_t::instance());
-		setContextMenu(menu);
-	}
-	// </FS:Zi>
-
 	if (menu)
 	{
 		gEditMenuHandler = this;