diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
| commit | 03290257345c22f909cf1cfac3981e7e07820d21 (patch) | |
| tree | 4b4be7538fb1768f32d6b3c2e7cd060b48d2faca /indra/llui/lllayoutstack.h | |
| parent | 889d4d292b2318a2be4988a700d5f56a193a377a (diff) | |
| parent | 41ceee848bbbaec892471b6396bd2d2383d10aa3 (diff) | |
merge up to latest 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; |