svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

1 files changed, 8 insertions, 12 deletions

diff --git a/indra/newview/llfloatergesture.h b/indra/newview/llfloatergesture.h
index f7c4e558ac..9c1ab27cb0 100644
--- a/indra/newview/llfloatergesture.h
+++ b/indra/newview/llfloatergesture.h
@@ -56,32 +56,28 @@ class LLFloaterGesture
 :	public LLFloater
 {
 public:
-	LLFloaterGesture();
+	LLFloaterGesture(const LLSD& key);
 	virtual ~LLFloaterGesture();
 
 	virtual BOOL postBuild();
 
-	static void show();
-	static void toggleVisibility();
-	static void refreshAll();
+	void refreshAll();
 
 protected:
 	// Reads from the gesture manager's list of active gestures
 	// and puts them in this list.
 	void buildGestureList();
 
-	static void onClickInventory(void* data);
-	static void onClickEdit(void* data);
-	static void onClickPlay(void* data);
-	static void onClickNew(void* data);
-	static void onCommitList(LLUICtrl* ctrl, void* data);
+	void onClickInventory();
+	void onClickEdit();
+	void onClickPlay();
+	void onClickNew();
+	void onCommitList();
 
 protected:
 	LLUUID mSelectedID;
 
-	static LLFloaterGesture* sInstance;
-	static LLFloaterGestureObserver* sObserver;
-	static LLFloaterGestureInventoryObserver* sInventoryObserver;
+	LLFloaterGestureObserver* mObserver;
 };