From 8b5a654c5ba5eb7fa44fabd49a7a965e988e03ef Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 22 Jul 2013 23:50:03 -0400
Subject: [PATCH] General cleanup of LLFloaterCustomize

---
 indra/newview/llfloatercustomize.cpp | 53 +++++++---------------------
 indra/newview/llfloatercustomize.h   | 30 +++-------------
 indra/newview/llinventorybridge.cpp  |  2 +-
 3 files changed, 17 insertions(+), 68 deletions(-)

diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp
index 69010602a..0aaab4b6c 100644
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -32,54 +32,25 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "llimagejpeg.h"
 #include "llfloatercustomize.h"
-#include "llfontgl.h"
-#include "llbutton.h"
-#include "lliconctrl.h"
-#include "llresmgr.h"
-#include "llmorphview.h"
-#include "llfloatertools.h"
+
 #include "llagent.h"
+#include "llagentcamera.h"
 #include "llagentwearables.h"
-#include "lltoolmorph.h"
-#include "llvoavatarself.h"
-#include "llradiogroup.h"
-#include "lltoolmgr.h"
-#include "llviewermenu.h"
+#include "llappearancemgr.h"
+#include "llmakeoutfitdialog.h"
+#include "llmorphview.h"
+#include "llnotificationsutil.h"
 #include "lloutfitobserver.h"
+#include "llpaneleditwearable.h"
 #include "llscrollcontainer.h"
 #include "llscrollingpanelparam.h"
-#include "llsliderctrl.h"
-#include "llviewerwindow.h"
-#include "llinventoryfunctions.h"
-#include "llinventoryobserver.h"
-#include "llinventoryicon.h"
 #include "lltextbox.h"
-#include "lllineeditor.h"
-#include "llviewertexturelist.h"
-#include "llfocusmgr.h"
-#include "llviewerwindow.h"
-#include "llviewercamera.h"
-#include "llappearance.h"
-#include "imageids.h"
-#include "llassetstorage.h"
-#include "lltexturectrl.h"
-#include "lltextureentry.h"
-#include "llwearablelist.h"
-#include "llviewerinventory.h"
-#include "lldbstrings.h"
-#include "llcolorswatch.h"
-#include "llglheaders.h"
-#include "llui.h"
-#include "llviewermessage.h"
-#include "llviewercontrol.h"
+#include "lltoolmorph.h"
 #include "lluictrlfactory.h"
-#include "llnotificationsutil.h"
-#include "llpaneleditwearable.h"
-#include "llmakeoutfitdialog.h"
-#include "llagentcamera.h"
-#include "llappearancemgr.h"
+#include "llviewerinventory.h"
+#include "llviewerwearable.h"
+#include "llvoavatarself.h"
 
 #include "statemachine/aifilepicker.h"
 #include "llxmltree.h"
@@ -757,7 +728,7 @@ void LLFloaterCustomize::saveCurrentWearables()
 
 bool LLFloaterCustomize::onSaveDialog(const LLSD& notification, const LLSD& response )
 {
-	S32 option = LLNotification::getSelectedOption(notification, response);
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
 	if(option == 0)
 	{
 		saveCurrentWearables();
diff --git a/indra/newview/llfloatercustomize.h b/indra/newview/llfloatercustomize.h
index 2a31c371d..3a7d09909 100644
--- a/indra/newview/llfloatercustomize.h
+++ b/indra/newview/llfloatercustomize.h
@@ -33,38 +33,16 @@
 #ifndef LL_LLFLOATERCUSTOMIZE_H
 #define LL_LLFLOATERCUSTOMIZE_H
 
-#include <map>
-
 #include "llfloater.h"
-#include "llstring.h"
-#include "v3dmath.h"
-#include "lltimer.h"
-#include "llundo.h"
-#include "llviewermenu.h"
 #include "llwearable.h"
-#include "lliconctrl.h"
 #include "llsingleton.h"
 
-class LLButton;
-class LLIconCtrl;
-class LLColorSwatchCtrl;
-class LLGenePool;
 class LLInventoryObserver;
-class LLJoint;
-class LLLineEditor;
-class LLMakeOutfitDialog;
-class LLRadioGroup;
 class LLScrollContainer;
 class LLScrollingPanelList;
 class LLTabContainer;
-class LLTextBox;
-class LLTextureCtrl;
-class LLViewerJointMesh;
-class LLViewerVisualParam;
-class LLVisualParam;
-class LLVisualParamReset;
 class LLViewerWearable;
-class LLWearableSaveAsDialog;
+class LLVisualParamReset;
 class LLPanelEditWearable;
 class AIFilePicker;
 
@@ -78,7 +56,7 @@ public:
 	LLFloaterCustomize();
 	virtual ~LLFloaterCustomize();
 
-	// Inherted methods
+	// Inherited methods
 	/*virtual*/ BOOL 	postBuild();
 	/*virtual*/ void	onClose(bool app_quitting);
 	/*virtual*/ void	draw();
@@ -91,11 +69,11 @@ public:
 
 
 private:
-	// Initilization	
+	// Initialization
 	void			initWearablePanels();
 	void			initScrollingPanelList();
 
-	// Deinitilization
+	// Destruction
 	void			delayedClose(bool proceed, bool app_quitting);
 
 	// Setters/Getters
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ae961fcbc..b4dc77e89 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -42,7 +42,6 @@
 #include "llavataractions.h"
 #include "llcallingcard.h"
 #include "llfirstuse.h"
-#include "llfloaterchat.h"
 #include "llfloatercustomize.h"
 #include "llfloateropenobject.h"
 #include "llfloaterproperties.h"
@@ -73,6 +72,7 @@
 #include "lltrans.h"
 #include "llviewerassettype.h"
 #include "llviewerfoldertype.h"
+#include "llviewermenu.h"
 #include "llviewermessage.h"
 #include "llviewerobjectlist.h"
 #include "llviewerregion.h"