diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-11 16:55:34 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-11 16:55:34 -0400 |
| commit | 47093f6e52741f36fcc782cb52e54baf9f6e3acf (patch) | |
| tree | 86b5d6fe9cd8dfbd5a9e36dab09c71f9de099cb3 /indra/llui/llfolderviewitem.h | |
| parent | d822d0e96bb69374f49fef8a827a042474deda8d (diff) | |
| parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) | |
merge
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 5ad5731cad..ed4496cfaa 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; @@ -117,7 +118,8 @@ protected: mIsCurSelection, mDragAndDropTarget, mIsMouseOverTitle, - mAllowOpen, + mAllowWear, + mAllowDrop, mSelectPending; LLUIColor mFontColor; |