diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
| commit | 90b8fb07ccd46bd18f3629ae2ec04a47312b41cb (patch) | |
| tree | 2e0a016cf2a0a3a869086dbde4e2f372bfe3f2c1 /indra/llui/lllayoutstack.h | |
| parent | e826cbd90750fd38565e4e44390948f36254cf1f (diff) | |
| parent | e859c3446b5c631fe0a9806434aa19b64a0d9113 (diff) | |
Merge with latest from 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; |