Merge from remote repo

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index 90f1693060..66368f979b 100644
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -60,6 +60,7 @@ public:
 protected:
 	LLIconCtrl(const Params&);
 	friend class LLUICtrlFactory;
+
 public:
 	virtual ~LLIconCtrl();
 
@@ -73,9 +74,16 @@ public:
 
 	void			setColor(const LLColor4& color) { mColor = color; }
 	
+private:
+	void setIconImageDrawSize() ;
+
 protected:
 	S32 mPriority;
 
+	//the output size of the icon image if set.
+	S32 mDrawWidth ;
+	S32 mDrawHeight ;
+
 private:
 	LLUIColor mColor;
 	LLPointer<LLUIImage> mImagep;