diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-26 22:28:18 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-26 22:28:18 +0300 |
| commit | 4080969968c5bac301d754e58ff938df6cbdb5a5 (patch) | |
| tree | 7350ad7b139bb994fc223e794cafccf306f62bc7 /indra/llui/llscrolllistcell.h | |
| parent | 8f35d638fbdbbdcf80ad1e6d826fd6161a0a2387 (diff) | |
SL-6109 Conflict resolution
Diffstat (limited to 'indra/llui/llscrolllistcell.h')
| -rw-r--r-- | indra/llui/llscrolllistcell.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h index 1604a9b1dc..b4bb14bcf1 100644 --- a/indra/llui/llscrolllistcell.h +++ b/indra/llui/llscrolllistcell.h @@ -103,6 +103,7 @@ public: virtual BOOL getVisible() const { return TRUE; } virtual void setWidth(S32 width) { mWidth = width; } virtual void highlightText(S32 offset, S32 num_chars) {} + virtual void setHighlighted(bool highlighted) {} virtual BOOL isText() const { return FALSE; } virtual BOOL needsToolTip() const { return ! mToolTip.empty(); } virtual void setColor(const LLColor4&) {} @@ -140,6 +141,7 @@ public: /*virtual*/ const LLSD getValue() const; /*virtual*/ BOOL getVisible() const; /*virtual*/ void highlightText(S32 offset, S32 num_chars); + /*virtual*/ void setHighlighted(bool highlighted); /*virtual*/ void setColor(const LLColor4&); /*virtual*/ BOOL isText() const; |