diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-01-09 10:05:07 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-01-09 10:05:07 -0800 |
| commit | 9ff4265baff19984096533f9dbd51ec255d9960c (patch) | |
| tree | 1cce734a7f7ac04a0aaa248adc7aa9fcfb6bc687 /indra/llui/lllayoutstack.h | |
| parent | 7236b1f4f8b3c14fe18af3d0bd5ee131ea7103dc (diff) | |
| parent | 3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llui/lllayoutstack.h')
| -rw-r--r-- | indra/llui/lllayoutstack.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index ede6149a80..3b308a359d 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -191,13 +191,12 @@ public: return min_dim; } + F32 getCollapseFactor(); void setOrientation(LLLayoutStack::ELayoutOrientation orientation) { mOrientation = orientation; } protected: LLLayoutPanel(const Params& p); - F32 getCollapseFactor(); - bool mExpandedMinDimSpecified; S32 mExpandedMinDim; |