diff options
| author | richard <none@none> | 2009-12-15 19:38:22 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-15 19:38:22 -0800 |
| commit | 943cae62dbe41472b4515edbfca8a12e83dd6936 (patch) | |
| tree | d03d24affc67ad672853cd98752df83e9506a85d /indra/llui/lllayoutstack.h | |
| parent | 17d1d3c129c25dd27ddbf2d15ab8873a61c16658 (diff) | |
| parent | 3a02b9ec882c98009ae6c24913ee8a7a620b0f87 (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(); }; |