diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 16:01:54 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 16:01:54 -0800 |
| commit | f23e0ffdb2ff2ad43a996c489b08c1324d9e5ee1 (patch) | |
| tree | e5219901b9edc82f78a530219707f5859ccb54fc /indra/llui/llfolderviewitem.h | |
| parent | b76123589381a2f59b704e8850792f9dcdc62517 (diff) | |
| parent | edeeed95416be2679e1ad3d29bab5396dbcccaa2 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/llui/llfolderviewitem.h')
| -rwxr-xr-x | indra/llui/llfolderviewitem.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index c8d6c37b04..c5d6d26e84 100755 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -135,6 +135,8 @@ protected: // no-op at this level, but reimplemented in derived classes. virtual void addItem(LLFolderViewItem*) { } virtual void addFolder(LLFolderViewFolder*) { } + virtual bool isHighlightAllowed(); + virtual bool isHighlightActive(); static LLFontGL* getLabelFontForStyle(U8 style); @@ -163,7 +165,6 @@ public: S32 getIconPad(); S32 getTextPad(); - LLFlashTimer* getFlashTimer() {return mFlashTimer;} // If 'selection' is 'this' then note that otherwise ignore. // Returns TRUE if this item ends up being selected. virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus); @@ -274,8 +275,6 @@ public: private: static std::map<U8, LLFontGL*> sFonts; // map of styles to fonts - LLFlashTimer* mFlashTimer; - }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |