diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2009-11-25 09:42:58 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2009-11-25 09:42:58 -0800 |
| commit | bb614fa887ec7cadc5b370c1dcf412ae5cf662e1 (patch) | |
| tree | 2ee594428704e0f4774f717d71485ee0bdde8748 /indra/llui/lltabcontainer.cpp | |
| parent | 6d66910c6e2fbb25bf8b5c7b90e795f350342104 (diff) | |
| parent | 57bc7dc44f31ef132a4abec228459c490c425eed (diff) | |
Merge of viewer 2
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 44eff8d357..d7d61cf6cb 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -391,7 +391,7 @@ void LLTabContainer::draw() mNextArrowBtn->setFlashing( TRUE ); } } - }
+ } idx++; } @@ -1339,12 +1339,12 @@ BOOL LLTabContainer::selectTab(S32 which) cbdata = selected_tuple->mTabPanel->getName(); BOOL res = FALSE; - if( mValidateSignal( this, cbdata ) ) + if( !mValidateSignal || (*mValidateSignal)( this, cbdata ) ) { res = setTab(which); - if (res) + if (res && mCommitSignal) { - mCommitSignal(this, cbdata); + (*mCommitSignal)(this, cbdata); } } |