Merge in latest viewer-2-0 changes.

1 files changed, 20 insertions, 0 deletions

diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index cd149e3113..8e5f19602f 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -106,6 +106,12 @@ public:
 		Optional<S32>			pad_left;
 		Optional<S32>			pad_bottom; // under text label
 		
+		//image overlay paddings
+		Optional<S32>			image_left_pad;
+		Optional<S32>			image_right_pad;
+		Optional<S32>			image_top_pad;
+		Optional<S32>			image_bottom_pad;
+
 		// callbacks
 		Optional<CommitCallbackParam>	click_callback, // alias -> commit_callback
 										mouse_down_callback,
@@ -186,6 +192,15 @@ public:
 	void			setLeftHPad( S32 pad )					{ mLeftHPad = pad; }
 	void			setRightHPad( S32 pad )					{ mRightHPad = pad; }
 
+	void 			setImageOverlayLeftPad( S32 pad )			{ mImageOverlayLeftPad = pad; }
+	S32 			getImageOverlayLeftPad() const				{ return mImageOverlayLeftPad; }
+	void 			setImageOverlayRightPad( S32 pad )			{ mImageOverlayRightPad = pad; }
+	S32 			getImageOverlayRightPad() const				{ return mImageOverlayRightPad; }
+	void 			setImageOverlayTopPad( S32 pad )			{ mImageOverlayTopPad = pad; }
+	S32 			getImageOverlayTopPad() const				{ return mImageOverlayTopPad; }
+	void 			setImageOverlayBottomPad( S32 pad )			{ mImageOverlayBottomPad = pad; }
+	S32 			getImageOverlayBottomPad() const			{ return mImageOverlayBottomPad; }
+
 	const std::string	getLabelUnselected() const { return wstring_to_utf8str(mUnselectedLabel); }
 	const std::string	getLabelSelected() const { return wstring_to_utf8str(mSelectedLabel); }
 
@@ -313,6 +328,11 @@ private:
 	S32							mRightHPad;
 	S32							mBottomVPad;	// under text label
 
+	S32							mImageOverlayLeftPad;
+	S32							mImageOverlayRightPad;
+	S32							mImageOverlayTopPad;
+	S32							mImageOverlayBottomPad;
+
 	F32							mHoverGlowStrength;
 	F32							mCurGlowStrength;