merge with release

1 files changed, 5 insertions, 6 deletions

diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index efa0925a4a..8b1092df46 100755
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -31,7 +31,6 @@
 #include "v4color.h"
 #include "lluictrl.h"
 #include "lluiimage.h"
-#include "stdenums.h"
 
 class LLTextBox;
 class LLUICtrlFactory;
@@ -50,7 +49,10 @@ public:
 		Optional<LLUIImage*>	image;
 		Optional<LLUIColor>		color;
 		Optional<bool>			use_draw_context_alpha;
+		Optional<S32>			min_width,
+								min_height;
 		Ignored					scale_image;
+
 		Params();
 	};
 protected:
@@ -72,15 +74,12 @@ public:
 	void			setImage(LLPointer<LLUIImage> image) { mImagep = image; }
 	const LLPointer<LLUIImage> getImage() { return mImagep; }
 	
-private:
-	void setIconImageDrawSize() ;
-
 protected:
 	S32 mPriority;
 
 	//the output size of the icon image if set.
-	S32 mDrawWidth ;
-	S32 mDrawHeight ;
+	S32 mMinWidth,
+		mMinHeight;
 
 	// If set to true (default), use the draw context transparency.
 	// If false, will use transparency returned by getCurrentTransparency(). See STORM-698.