merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3

1 files changed, 5 insertions, 0 deletions

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 415ae59ca2..c20c81e052 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -390,6 +390,8 @@ public:
 		Optional<LLButton::Params> left_scroll_button,
 								   right_scroll_button;
 
+		Optional<S32> min_width;
+
 		Params();
 	};
 
@@ -558,6 +560,8 @@ protected:
 
 	S32 mChicletPadding;
 	S32 mScrollingOffset;
+	S32 mMinWidth;
+	bool mShowControls;
 };
 
 /*
@@ -580,6 +584,7 @@ public:
 	/*virtual*/ ~LLTalkButton();
 
 	/*virtual*/ void draw();
+	void setSpeakBtnToggleState(bool state);
 
 protected:
 	friend class LLUICtrlFactory;