livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-15763: Right clicking on navigation bar not displaying all menu options

Ansariel 2015-03-23 23:52:53 +01:00
parent 4298ef25e7
commit a7e1243c57
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/llui/lllineeditor.cpp
View File

@ -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;