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("menu_text_editor.xml", LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instance()); + // 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; + } + // } // Route menu to this class