diff options
author | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:45:49 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-04 16:45:49 +0300 |
commit | f94a19e09ebcf51e3e6cd3437fe364b60755406f (patch) | |
tree | fa4f585008c6f5aa7850b2f5128a681b0065fcdc /indra/llui/llfolderviewitem.h | |
parent | d04a3b6d4e67dafa0b6dd8e88b752c5a929de5b0 (diff) | |
parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) |
Merge downstream code and become version 3.8.3
Diffstat (limited to 'indra/llui/llfolderviewitem.h')
-rwxr-xr-x | indra/llui/llfolderviewitem.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index f77d676f46..0322c8836d 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -59,7 +59,8 @@ public: item_top_pad; Optional<time_t> creation_date; - Optional<bool> allow_open; + Optional<bool> allow_wear; + Optional<bool> allow_drop; Optional<LLUIColor> font_color; Optional<LLUIColor> font_highlight_color; @@ -118,7 +119,8 @@ protected: mIsCurSelection, mDragAndDropTarget, mIsMouseOverTitle, - mAllowOpen, + mAllowWear, + mAllowDrop, mSelectPending; LLUIColor mFontColor; |