diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:30:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:30:08 +0300 |
| commit | 8701e0973450da9c3c1dd905e73011bdeb09c93e (patch) | |
| tree | aecadf995f0174cc41f7cb9846a1382a930d8f82 /indra/llui/lltabcontainer.cpp | |
| parent | 37392be4171303db08a4842b7882b4cb758a8f8d (diff) | |
| parent | 8fa956a16e616191e21bf001eabc4670453debcd (diff) | |
Merge pull request #1178 from secondlife/marchcat/b-merge
Release (Maint W) -> Maint B merge
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 |