diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-18 16:08:39 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-12-18 16:08:39 -0800 |
| commit | aa7efb7540d9eed9d8832bb65c52c3fdb1b811c8 (patch) | |
| tree | d74df2438d1d62b6c2c683a12bcd42d8dee6e41b /indra/llui/lllayoutstack.h | |
| parent | 043407238a4162c0d20413338cf6a7088be1f674 (diff) | |
| parent | 4964ca39f14531630ffbfece593f8ba9cdc86e4e (diff) | |
merge.
Diffstat (limited to 'indra/llui/lllayoutstack.h')
| -rw-r--r-- | indra/llui/lllayoutstack.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index abd5436018..c1af428674 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -45,9 +45,8 @@ public: { Optional<std::string> orientation; Optional<S32> border_size; - Optional<bool> animate; - Optional<bool> clip; - // mMinWidth and mMinHeight are calculated, not set in XML + Optional<bool> animate, + clip; Params(); }; |