diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-01 14:24:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-01 14:24:01 -0400 |
| commit | 2fde4a9ae55a8641a5a7a9091af4d598b7e8d847 (patch) | |
| tree | 1ffa1f6a643579fd32da5fc241f03a5fdd2cbf42 /indra/llui/lltabcontainer.h | |
| parent | e42142005585f580d39036fba02ec060d739cc5f (diff) | |
| parent | 7333731bbca764fdac87173fa5a6e5f2bb46c1d2 (diff) | |
merge changes for 3.5.0-beta7
Diffstat (limited to 'indra/llui/lltabcontainer.h')
| -rw-r--r-- | indra/llui/lltabcontainer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h index cebace2ceb..57862fc626 100644 --- a/indra/llui/lltabcontainer.h +++ b/indra/llui/lltabcontainer.h @@ -188,10 +188,11 @@ public: void selectFirstTab(); void selectLastTab(); void selectNextTab(); - void selectPrevTab(); + void selectPrevTab(); BOOL selectTabPanel( LLPanel* child ); BOOL selectTab(S32 which); BOOL selectTabByName(const std::string& title); + void setCurrentPanelIndex(S32 index) { mCurrentTabIdx = index; } BOOL getTabPanelFlashing(LLPanel* child); void setTabPanelFlashing(LLPanel* child, BOOL state); @@ -242,8 +243,6 @@ private: void setTabsHidden(BOOL hidden) { mTabsHidden = hidden; } BOOL getTabsHidden() const { return mTabsHidden; } - - void setCurrentPanelIndex(S32 index) { mCurrentTabIdx = index; } void scrollPrev() { mScrollPos = llmax(0, mScrollPos-1); } // No wrap void scrollNext() { mScrollPos = llmin(mScrollPos+1, mMaxScrollPos); } // No wrap |