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, 5 insertions, 3 deletions

diff --git a/indra/newview/llfloaterauction.h b/indra/newview/llfloaterauction.h
index b018316c64..ebb1a0d1ae 100644
--- a/indra/newview/llfloaterauction.h
+++ b/indra/newview/llfloaterauction.h
@@ -46,18 +46,20 @@
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 class LLParcelSelection;
 
-class LLFloaterAuction : public LLFloater, public LLFloaterSingleton<LLFloaterAuction>
+class LLFloaterAuction : public LLFloater
 {
-	friend class LLUISingleton<LLFloaterAuction, VisibilityPolicy<LLFloater> >;
+	friend class LLFloaterReg;
 public:
 	// LLFloater interface
 	/*virtual*/ void onClose(bool app_quitting) { setVisible(FALSE); }
 	/*virtual*/ void onOpen(const LLSD& key);
 	/*virtual*/ void draw();
+
+private:
 	
 	LLFloaterAuction(const LLSD& key);
 	~LLFloaterAuction();
-private:
+	
 	void initialize();
 
 	static void onClickSnapshot(void* data);