diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-04-20 14:08:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-04-20 14:08:23 +0800 |
| commit | 23a35d763bca645ce628d80ebd939c979590724c (patch) | |
| tree | 434e8413c209d8a29fe93ed17ea2717817660a7e /indra/llui/lltabcontainer.cpp | |
| parent | 1a4517e5af8f43433fc2547658615dce4073d9a3 (diff) | |
| parent | 78174fc8658caeddfd8306ec19eb0e1c2975368e (diff) | |
Merge tag '7.1.5-release'
source for viewer 7.1.5.8443591509
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index cb36f72f6e..6aeae0f291 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -1516,25 +1516,23 @@ BOOL LLTabContainer::selectTab(S32 which) LLTabTuple* selected_tuple = getTab(which); if (!selected_tuple) - { return FALSE; - } - + LLSD cbdata; if (selected_tuple->mTabPanel) cbdata = selected_tuple->mTabPanel->getName(); - BOOL res = FALSE; - if( !mValidateSignal || (*mValidateSignal)( this, cbdata ) ) + BOOL result = FALSE; + if (!mValidateSignal || (*mValidateSignal)(this, cbdata)) { - res = setTab(which); - if (res && mCommitSignal) + result = setTab(which); + if (result && mCommitSignal) { (*mCommitSignal)(this, cbdata); } } - - return res; + + return result; } // private |