From 61b1128d76b5f42bf87feeeafe4a165ea952c08c Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 20 Jan 2019 09:32:13 -0500 Subject: [PATCH] Allow menu xmls from v3 that use context_menu tag instead of menu Just parse them as LLMenuGL for now, that's what they basically are. --- indra/llui/lluictrlfactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index 9209d484f..11605bafd 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -412,13 +412,13 @@ LLMenuGL *LLUICtrlFactory::buildMenu(const std::string &filename, LLView* parent } // root must be called panel - if( !root->hasName( "menu_bar" ) && !root->hasName( "menu" )) + if( !root->hasName( "menu_bar" ) && !root->hasName( "menu" ) && !root->hasName("context_menu")) { LL_WARNS() << "Root node should be named menu bar or menu in : " << filename << LL_ENDL; return NULL; } - if (root->hasName("menu")) + if (root->hasName("menu") || root->hasName("context_menu")) { menu = (LLMenuGL*)LLMenuGL::fromXML(root, parentp, this); }