diff options
| author | James Cook <james@lindenlab.com> | 2009-12-16 16:04:26 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-16 16:04:26 -0800 |
| commit | 4c0d5200bc7a53537f9ee7028e74c1feb4abc52e (patch) | |
| tree | 85a48a0e970c5376ab216d86b068db303ead30af /indra/llui/lllayoutstack.h | |
| parent | 699d038af4edf9e854525ea380905737b645ebfc (diff) | |
| parent | e8fe81c4fcbec173606b5ad635e0b774e4d8b24b (diff) | |
Merge
Diffstat (limited to 'indra/llui/lllayoutstack.h')
| -rw-r--r-- | indra/llui/lllayoutstack.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index c1af428674..abd5436018 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -45,8 +45,9 @@ public: { Optional<std::string> orientation; Optional<S32> border_size; - Optional<bool> animate, - clip; + Optional<bool> animate; + Optional<bool> clip; + // mMinWidth and mMinHeight are calculated, not set in XML Params(); }; |