merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4

1 files changed, 8 insertions, 10 deletions

diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h
index 11c3356c46..65be9e183a 100644
--- a/indra/newview/llchiclet.h
+++ b/indra/newview/llchiclet.h
@@ -180,7 +180,7 @@ public:
 		Params(){};
 	};
 
-	static LLChicletPanel* create();
+	~LLChicletPanel();
 
 	LLChiclet* createChiclet(LLSD* imSessionId = NULL, S32 pos = 0);
 
@@ -200,10 +200,6 @@ public:
 
 	void removeAll();
 
-	void arrange();
-
-	~LLChicletPanel();
-
 	void scrollLeft();
 
 	void scrollRight();
@@ -224,18 +220,22 @@ public:
 
 	void draw();
 
-	BOOL postBuild();
-
 protected:
 	LLChicletPanel(const Params&p);
 	friend class LLUICtrlFactory;
 
-	bool needsScrolling();
+	void arrange();
 
 	bool canScrollRight();
 
 	bool canScrollLeft();
 
+	void showScrollButtonsIfNeeded();
+
+	S32 getFirstVisibleChiclet();
+
+	void reshapeScrollArea(S32 delta_width);
+
 	enum ScrollDirection
 	{
 		SCROLL_LEFT = 1,
@@ -255,8 +255,6 @@ protected:
 	chiclet_list_t mChicletList;
 	LLButton* mLeftScroll;
 	LLButton* mRightScroll;
-	S32 mFirstToShow;
-	S32 mLastToShow;
 	LLPanel* mScrollArea;
 };