From d1582a5105f01181535fb859c530e45c2efca071 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 5 Feb 2007 20:20:42 +0000
Subject: merge -r 57111:57464 maintenance.

---
 indra/llui/llscrolllistctrl.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/llui/llscrolllistctrl.h')

diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 805efe8679..985ccc12a5 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -38,7 +38,7 @@ public:
 	virtual const LLString&	getTextLower() const { return LLString::null; }
 	virtual const BOOL		getVisible() const { return TRUE; }
 	virtual void			setWidth(S32 width) = 0;
-	virtual void			highlightText(S32 num_chars) {}
+	virtual void			highlightText(S32 offset, S32 num_chars) {}
 
 	virtual BOOL	handleClick() { return FALSE; }
 	virtual	void	setEnabled(BOOL enable) { }
@@ -57,7 +57,7 @@ public:
 	virtual S32		getHeight() const			{ return llround(mFont->getLineHeight()); }
 	virtual const LLString&		getText() const		{ return mText.getString(); }
 	virtual const BOOL			getVisible() const  { return mVisible; }
-	virtual void	highlightText(S32 num_chars) {mHighlightChars = num_chars;}
+	virtual void	highlightText(S32 offset, S32 num_chars) {mHighlightOffset = offset; mHighlightCount = num_chars;}
 	void			setText(const LLString& text);
 
 private:
@@ -68,7 +68,8 @@ private:
 	S32				mWidth;
 	S32				mEllipsisWidth;	// in pixels, of "..."
 	BOOL			mVisible;
-	S32				mHighlightChars;
+	S32				mHighlightCount;
+	S32				mHighlightOffset;
 
 	LLPointer<LLImageGL> mRoundedRectImage;
 };
-- 
cgit v1.2.3