diff options
| author | Richard Linden <none@none> | 2011-12-12 12:33:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-12-12 12:33:03 -0800 |
| commit | 2010e20122bb1ae10d760bcbf5e97c74d0492503 (patch) | |
| tree | 278a163d3242c87c8f11fb012c1e2e1947c5830e /indra/llui/lllayoutstack.h | |
| parent | ec30e6e70ff71723e2137595bc6ecd3eb358aabe (diff) | |
| parent | 40a74eb5b77493e66587a01b6655d405c75e3a59 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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; |