diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-11 14:10:13 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-11 14:10:13 +0300 |
commit | c757446ac7218b4216ff97b5aaceb91f77eb1ca7 (patch) | |
tree | 38826509ad69b0c696556d08daa16513c311dfb5 /indra/newview/llfolderviewitem.h | |
parent | 53fcb0927539c224a9c078605f9a1164acbb5f53 (diff) | |
parent | fc6d238884f06951a413004b46569304a9d9280a (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfolderviewitem.h')
-rw-r--r-- | indra/newview/llfolderviewitem.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h index 57c722afa4..d6e4b2f556 100644 --- a/indra/newview/llfolderviewitem.h +++ b/indra/newview/llfolderviewitem.h @@ -97,6 +97,7 @@ public: { Optional<LLUIImage*> icon; Optional<LLUIImage*> icon_open; // used for folders + Optional<LLUIImage*> icon_overlay; // for links Optional<LLFolderView*> root; Optional<LLFolderViewEventListener*> listener; @@ -147,6 +148,7 @@ protected: LLUIImagePtr mIcon; std::string mStatusText; LLUIImagePtr mIconOpen; + LLUIImagePtr mIconOverlay; BOOL mHasVisibleChildren; S32 mIndentation; S32 mItemHeight; |