diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-04 16:22:01 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-04 16:22:01 +0000 |
| commit | d1d248973d577d314bba16dc9f2977a7125b5f0d (patch) | |
| tree | 6472b8a161224072ddde6ad5ffbc001fcc0dd028 /indra/newview/llfloaterfixedenvironment.cpp | |
| parent | 5b11cad690ba03f1afe3763f4c1cfc125796796c (diff) | |
| parent | a4c49904c67e123df0d8e1f68714cf13acfa1ffc (diff) | |
Merged in andreykproductengine/maint-eep2 (pull request #68)
MAINT-8989 Menu updates button instead of executing command
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index 82f056710e..39e37034e7 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -108,7 +108,7 @@ BOOL LLFloaterFixedEnvironment::postBuild() getChild<LLButton>(BUTTON_NAME_CANCEL)->setClickedCallback([this](LLUICtrl *, const LLSD &) { onClickCloseBtn(); }); getChild<LLButton>(BUTTON_NAME_LOAD)->setClickedCallback([this](LLUICtrl *, const LLSD &) { onButtonLoad(); }); - mFlyoutControl = new LLFlyoutComboBtnCtrl(this, BUTTON_NAME_COMMIT, BUTTON_NAME_FLYOUT, XML_FLYOUTMENU_FILE); + mFlyoutControl = new LLFlyoutComboBtnCtrl(this, BUTTON_NAME_COMMIT, BUTTON_NAME_FLYOUT, XML_FLYOUTMENU_FILE, false); mFlyoutControl->setAction([this](LLUICtrl *ctrl, const LLSD &data) { onButtonApply(ctrl, data); }); mFlyoutControl->setMenuItemVisible(ACTION_COMMIT, false); |