Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:

lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14

1 files changed, 11 insertions, 20 deletions

diff --git a/indra/newview/llfloatermemleak.h b/indra/newview/llfloatermemleak.h
index 7d9d5f9c5f..763af943ba 100644
--- a/indra/newview/llfloatermemleak.h
+++ b/indra/newview/llfloatermemleak.h
@@ -37,34 +37,28 @@
 
 class LLFloaterMemLeak : public LLFloater
 {
+	friend class LLFloaterReg;
 public:
-    LLFloaterMemLeak();
-	virtual ~LLFloaterMemLeak();
-
 	/// initialize all the callbacks for the menu
-	//void initCallbacks(void);
+
 	virtual BOOL postBuild() ;
 	virtual void draw() ;
-
-	/// one and one instance only
-	static LLFloaterMemLeak* instance();
 	
-	static void onChangeLeakingSpeed(LLUICtrl* ctrl, void* userData);
-	static void onChangeMaxMemLeaking(LLUICtrl* ctrl, void* userData);
-	static void onClickStart(void* userData);
-	static void onClickStop(void* userData);
-	static void onClickRelease(void* userData);
-	static void onClickClose(void* userData);
-		
-	/// show off our menu
-	static void show(void*);
+	void onChangeLeakingSpeed();
+	void onChangeMaxMemLeaking();
+	void onClickStart();
+	void onClickStop();
+	void onClickRelease();
+	void onClickClose();
 
 public:
-	static LLFloaterMemLeak* getInstance() ;
 	void idle() ;
 	void stop() ;
 
 private:
+	
+	LLFloaterMemLeak(const LLSD& key);
+	virtual ~LLFloaterMemLeak();
 	void release() ;
 
 private:
@@ -75,9 +69,6 @@ private:
 		START
 	} ;
 
-	// one instance on the inside
-	static LLFloaterMemLeak* sInstance;
-
 	static U32 sMemLeakingSpeed ; //bytes leaked per frame
 	static U32 sMaxLeakedMem ; //maximum allowed leaked memory
 	static U32 sTotalLeaked ;