diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-22 18:26:54 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-22 18:26:54 +0300 |
| commit | 6da0a6873b122b95b203633d3d5dda2b54c6fc43 (patch) | |
| tree | 5dd6927428e27ff1d1ce74a569a4cfe94528faf3 /indra/llui/lltoolbar.cpp | |
| parent | 0ed270a0569e205f837f84773f5e72ab3b46d01b (diff) | |
| parent | ef2decdbe9fd2add86f1117f423b680a3b79f927 (diff) | |
Merge branch 'SL-14862' into DRTVWR-518-ui
# Conflicts:
# indra/newview/llstartup.cpp
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index e6f466ec78..4868c66d1b 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -967,6 +967,8 @@ LLToolBarButton* LLToolBar::createButton(const LLCommandId& id) executeStopParam.function_name = executeStopFunction; executeStopParam.parameter = commandp->executeStopParameters(); LLUICtrl::commit_callback_t execute_func = initCommitCallback(executeParam); + button->setFunctionName(commandp->executeFunctionName()); + LL_DEBUGS("UIUsage") << "button function name a -> " << commandp->executeFunctionName() << LL_ENDL; LLUICtrl::commit_callback_t stop_func = initCommitCallback(executeStopParam); button->setMouseDownCallback(boost::bind(&LLToolBarButton::callIfEnabled, button, execute_func, _1, _2)); @@ -974,6 +976,8 @@ LLToolBarButton* LLToolBar::createButton(const LLCommandId& id) } else { + button->setFunctionName(commandp->executeFunctionName()); + LL_DEBUGS("UIUsage") << "button function name b -> " << commandp->executeFunctionName() << LL_ENDL; button->setCommitCallback(executeParam); } |