diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 19:21:30 +0000 |
commit | 6fbf39f9b319106e39f80b8641acaba122d02e0a (patch) | |
tree | e47af1ff1bd1db52fd93c11d857b11387bacf01a /indra/llui/llaccordionctrl.cpp | |
parent | 05200cf827d9a6263adc4905bf41a4905bce2659 (diff) | |
parent | 64a9ad0f5f52dac633a76e39335a7def2573b82e (diff) |
Merged in lmr4-merge-6.4.6 (pull request #213)
Merge master v6.4.6 into DRTVWR-497 (VS2017)
Diffstat (limited to 'indra/llui/llaccordionctrl.cpp')
-rw-r--r-- | indra/llui/llaccordionctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp index 623f570cef..edcbc3fbb7 100644 --- a/indra/llui/llaccordionctrl.cpp +++ b/indra/llui/llaccordionctrl.cpp @@ -338,7 +338,7 @@ void LLAccordionCtrl::addCollapsibleCtrl(LLView* view) addChild(accordion_tab); mAccordionTabs.push_back(accordion_tab); - accordion_tab->setDropDownStateChangedCallback( boost::bind(&LLAccordionCtrl::onCollapseCtrlCloseOpen, this, mAccordionTabs.size() - 1) ); + accordion_tab->setDropDownStateChangedCallback( boost::bind(&LLAccordionCtrl::onCollapseCtrlCloseOpen, this, (S16)(mAccordionTabs.size() - 1)) ); arrange(); } |