From 1aa0416aef379bb3ad1012441588b6d7fab81b40 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Fri, 13 Mar 2009 21:28:40 +0000
Subject: svn merge -r114093:114412
 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
 Melinda (coco): 5th and final batch of featurettes. My work here is done.

---
 indra/newview/lltoolbrush.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/lltoolbrush.h')

diff --git a/indra/newview/lltoolbrush.h b/indra/newview/lltoolbrush.h
index 3165753804..fca275aa4d 100644
--- a/indra/newview/lltoolbrush.h
+++ b/indra/newview/lltoolbrush.h
@@ -96,11 +96,14 @@ protected:
 	F32 mStartingZ;
 	S32 mMouseX;
 	S32 mMouseY;
-	S32 mBrushIndex;
+	F32 mBrushSize;
 	BOOL mGotHover;
 	BOOL mBrushSelected;
 	// Order doesn't matter and we do check for existance of regions, so use a set
 	region_list_t mLastAffectedRegions;
+
+private:
+	U8 getBrushIndex();
 };
 
 
-- 
cgit v1.2.3