From a3f4de55b5fc05a5678ceca293308ef2aac22ce1 Mon Sep 17 00:00:00 2001
From: Beq <BeqJanus@vcs.firestormviewer.org>
Date: Mon, 19 Jul 2021 12:10:45 +0100
Subject: [PATCH] FIRE-31081 - Bugsplat crash - null this ptr in
 setItemVisible.

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

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 792c96a173..f6ef8a2731 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2193,6 +2193,13 @@ void LLTextEditor::showContextMenu(S32 x, S32 y, bool set_cursor_pos)
 		mContextMenu = LLUICtrlFactory::instance().createFromFile<LLContextMenu>("menu_text_editor.xml", 
 																				LLMenuGL::sMenuContainer, 
 																				LLMenuHolderGL::child_registry_t::instance());
+		// <FS:Beq> FIRE-31081 defend against null this prt exception in setItemVisible found in BugSplat
+		if(!mContextMenu)
+		{
+			LL_WARNS() << "Failed to create context menu 'menu_text_editor'" << LL_ENDL;
+			return;
+		}
+		// </FS:Beq>
 	}
 
 	// Route menu to this class