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, 9 insertions, 6 deletions

diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
index 87833793af..e7dda3a5f4 100644
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -38,14 +38,11 @@
 #include "lltexteditor.h"
 
 class LLFloaterSettingsDebug 
-:	public LLFloater, 
-	public LLFloaterSingleton<LLFloaterSettingsDebug>
+:	public LLFloater
 {
+	friend class LLFloaterReg;
+
 public:
-	// key - selects which settings to show, one of:
-	// "all", "base", "account", "skin"
-	LLFloaterSettingsDebug(const LLSD& key);
-	virtual ~LLFloaterSettingsDebug();
 
 	virtual BOOL postBuild();
 	virtual void draw();
@@ -56,6 +53,12 @@ public:
 	void onCommitSettings();
 	void onClickDefault();
 
+private:
+	// key - selects which settings to show, one of:
+	// "all", "base", "account", "skin"
+	LLFloaterSettingsDebug(const LLSD& key);
+	virtual ~LLFloaterSettingsDebug();
+	
 protected:
 	LLTextEditor* mComment;
 };