diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-02-24 21:02:12 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-02-24 21:02:12 -0500 |
commit | b5324afb6f2e45deefb9b79e7e2192bc686b181a (patch) | |
tree | dcae0395e2975f736a90c1fa3c67d6f318e01cc7 /indra/llui/lltabcontainer.h | |
parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
parent | c7841b48bdec74848a64e2dd0eac453ce855093d (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llui/lltabcontainer.h')
-rwxr-xr-x | indra/llui/lltabcontainer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h index 57862fc626..057809dc42 100755 --- a/indra/llui/lltabcontainer.h +++ b/indra/llui/lltabcontainer.h @@ -182,7 +182,8 @@ public: LLPanel* getPanelByIndex(S32 index); S32 getIndexForPanel(LLPanel* panel); S32 getPanelIndexByTitle(const std::string& title); - LLPanel* getPanelByName(const std::string& name); + LLPanel* getPanelByName(const std::string& name); + S32 getTotalTabWidth() const; void setCurrentTabName(const std::string& name); void selectFirstTab(); @@ -287,7 +288,7 @@ private: S32 mMaxTabWidth; S32 mTotalTabWidth; - S32 mTabHeight; + S32 mTabHeight; // Padding under the text labels of tab buttons S32 mLabelPadBottom; |