diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-19 15:49:48 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-19 15:49:48 -0500 |
| commit | 7e9ba401d1489ef96c5315f03332f28d62d97899 (patch) | |
| tree | c2eabeb3f4f635ae49e5a3e9b07da54dad30eee2 /indra/llui/lllayoutstack.h | |
| parent | 2abb1a81c56a27eab02157851cb9e67730231bb6 (diff) | |
| parent | 4c5141c5677a2e98c1331026d4e119abee6ab2ae (diff) | |
reconciled .hgtags
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; |