diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
| commit | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (patch) | |
| tree | d746c96bab1bfd44c6373926608e91c0f2fd9e49 /indra/llui/llmenubutton.cpp | |
| parent | eab232d3ed49bfb1f873e332ff57ec8c311c163b (diff) | |
| parent | 6d6eabca44d08d5b97bfe3e941d2b9687c2246ea (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/llui/llmenubutton.cpp')
| -rw-r--r-- | indra/llui/llmenubutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp index 85aa766918..5374b7ea73 100644 --- a/indra/llui/llmenubutton.cpp +++ b/indra/llui/llmenubutton.cpp @@ -95,7 +95,7 @@ void LLMenuButton::setMenu(const std::string& menu_filename, EMenuPosition posit } llassert(LLMenuGL::sMenuContainer != NULL); - LLToggleableMenu* menu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>(menu_filename, LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instance(), true); + LLToggleableMenu* menu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>(menu_filename, LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instance()); if (!menu) { LL_WARNS() << "Error loading menu_button menu" << LL_ENDL; |