From af68921a7ae432ec3f0bb827c186fb8f5bd53b0d Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Thu, 15 Oct 2015 12:57:35 -0600
Subject: [PATCH] 107 places lluictrlfactor.h doesn't belong
---
indra/llui/llstatbar.cpp | 1 -
indra/newview/llappviewer.cpp | 1 -
indra/newview/llavatariconctrl.cpp | 1 -
indra/newview/llchatbar.cpp | 1 -
indra/newview/llchathistory.cpp | 1 -
indra/newview/llconfirmationmanager.cpp | 2 --
indra/newview/llconversationview.cpp | 1 -
indra/newview/llcurrencyuimanager.cpp | 1 -
indra/newview/llfavoritesbar.cpp | 1 -
indra/newview/llfloaterabout.cpp | 1 -
indra/newview/llfloaterauction.cpp | 1 -
indra/newview/llfloaterautoreplacesettings.cpp | 1 -
indra/newview/llfloateravatar.cpp | 1 -
indra/newview/llfloateravatarpicker.cpp | 1 -
indra/newview/llfloateravatartextures.cpp | 1 -
indra/newview/llfloaterbeacons.cpp | 1 -
indra/newview/llfloaterbuildoptions.cpp | 1 -
indra/newview/llfloaterbulkpermission.cpp | 1 -
indra/newview/llfloaterbump.cpp | 1 -
indra/newview/llfloaterbuy.cpp | 1 -
indra/newview/llfloaterbuycontents.cpp | 2 --
indra/newview/llfloaterbuycurrency.cpp | 2 --
indra/newview/llfloaterbuyland.cpp | 1 -
indra/newview/llfloaterbvhpreview.cpp | 1 -
indra/newview/llfloatercolorpicker.cpp | 1 -
indra/newview/llfloaterfonttest.cpp | 1 -
indra/newview/llfloatergodtools.cpp | 1 -
indra/newview/llfloatergroups.cpp | 1 -
indra/newview/llfloaterhardwaresettings.cpp | 1 -
indra/newview/llfloaterhud.cpp | 1 -
indra/newview/llfloaterimagepreview.cpp | 1 -
indra/newview/llfloaterinspect.cpp | 3 ---
indra/newview/llfloaterjoystick.cpp | 1 -
indra/newview/llfloaterlagmeter.cpp | 1 -
indra/newview/llfloaterland.cpp | 1 -
indra/newview/llfloaterlandholdings.cpp | 1 -
indra/newview/llfloatermediasettings.cpp | 1 -
indra/newview/llfloatermemleak.cpp | 1 -
indra/newview/llfloatermessagebuilder.cpp | 1 -
indra/newview/llfloatermodelpreview.cpp | 1 -
indra/newview/llfloaternamedesc.cpp | 2 --
indra/newview/llfloaternotificationsconsole.cpp | 1 -
indra/newview/llfloateropenobject.cpp | 2 --
indra/newview/llfloaterpay.cpp | 1 -
indra/newview/llfloaterperms.cpp | 1 -
indra/newview/llfloaterpostprocess.cpp | 1 -
indra/newview/llfloaterpreference.cpp | 1 -
indra/newview/llfloaterproperties.cpp | 2 --
indra/newview/llfloaterregioninfo.cpp | 1 -
indra/newview/llfloaterreporter.cpp | 1 -
indra/newview/llfloaterscriptdebug.cpp | 1 -
indra/newview/llfloaterscriptlimits.cpp | 1 -
indra/newview/llfloatersellland.cpp | 2 --
indra/newview/llfloatersettingsdebug.cpp | 1 -
indra/newview/llfloatertelehub.cpp | 1 -
indra/newview/llfloatertexturefetchdebugger.cpp | 2 --
indra/newview/llfloatertools.cpp | 1 -
indra/newview/llfloatertopobjects.cpp | 2 --
indra/newview/llfloatertos.cpp | 1 -
indra/newview/llfloaterurlentry.cpp | 1 -
indra/newview/llfloaterwhitelistentry.cpp | 1 -
indra/newview/llfloaterworldmap.cpp | 1 -
indra/newview/llgroupmgr.cpp | 3 +--
indra/newview/llhudview.cpp | 1 -
indra/newview/llimview.cpp | 1 -
indra/newview/llinventoryfunctions.cpp | 2 --
indra/newview/llinventorypanel.h | 1 -
indra/newview/llpanelavatartag.cpp | 1 -
indra/newview/llpanelexperiences.cpp | 1 -
indra/newview/llpanelface.cpp | 1 -
indra/newview/llpanelgroup.cpp | 13 +++++--------
indra/newview/llpanelgroupbulk.cpp | 2 --
indra/newview/llpanelgroupbulkban.cpp | 2 --
indra/newview/llpanelgroupexperiences.cpp | 1 -
indra/newview/llpanelgroupgeneral.cpp | 1 -
indra/newview/llpanelgroupinvite.cpp | 2 --
indra/newview/llpanelgrouplandmoney.cpp | 1 -
indra/newview/llpanelland.cpp | 2 --
indra/newview/llpanellandmedia.cpp | 1 -
indra/newview/llpanellogin.cpp | 1 -
indra/newview/llpanelmediasettingsgeneral.cpp | 2 --
indra/newview/llpanelmediasettingspermissions.cpp | 3 ---
indra/newview/llpanelmediasettingssecurity.cpp | 1 -
indra/newview/llpanelobject.cpp | 1 -
indra/newview/llpaneloutfitedit.cpp | 1 -
indra/newview/llpanelpeople.cpp | 1 -
indra/newview/llpanelpeoplemenus.cpp | 1 -
indra/newview/llpanelpermissions.cpp | 1 -
indra/newview/llpanelplaces.cpp | 1 -
indra/newview/llpanelprimmediacontrols.cpp | 2 --
indra/newview/llpanelteleporthistory.h | 2 --
indra/newview/llpanelvoicedevicesettings.cpp | 3 ---
indra/newview/llpanelvolume.cpp | 1 -
indra/newview/llpreviewanim.cpp | 2 --
indra/newview/llpreviewnotecard.cpp | 1 -
indra/newview/llpreviewsound.cpp | 1 -
indra/newview/llpreviewtexture.cpp | 2 --
indra/newview/llsearchcombobox.cpp | 1 -
indra/newview/llsidepanelappearance.cpp | 1 -
indra/newview/llstatusbar.cpp | 1 -
indra/newview/llviewermediafocus.cpp | 1 -
indra/newview/llviewermenufile.cpp | 1 -
indra/newview/llviewertexteditor.cpp | 1 -
indra/newview/llwaterparammanager.cpp | 1 -
indra/newview/llwaterparamset.cpp | 1 -
indra/newview/llwlparammanager.cpp | 1 -
indra/newview/llwlparamset.cpp | 1 -
107 files changed, 6 insertions(+), 140 deletions(-)
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index ef84db46d8..00033ca969 100755
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -34,7 +34,6 @@
#include "llgl.h"
#include "llfontgl.h"
-#include "lluictrlfactory.h"
#include "lltracerecording.h"
#include "llcriticaldamp.h"
#include "lltooltip.h"
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 54f27d0f64..9d1bbd12aa 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -31,7 +31,6 @@
// Viewer includes
#include "llversioninfo.h"
#include "llfeaturemanager.h"
-#include "lluictrlfactory.h"
#include "lltexteditor.h"
#include "llerrorcontrol.h"
#include "lleventtimer.h"
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index bf8fd986c9..05d0082074 100755
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -33,7 +33,6 @@
#include "llcallingcard.h" // for LLAvatarTracker
#include "llavataractions.h"
#include "llmenugl.h"
-#include "lluictrlfactory.h"
#include "llagentdata.h"
#include "llfloaterimsession.h"
#include "llviewertexture.h"
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 4d9617d395..5ab2e88df5 100755
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -58,7 +58,6 @@
#include "llmultigesture.h"
#include "llui.h"
#include "llviewermenu.h"
-#include "lluictrlfactory.h"
#include "alchatcommand.h"
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 2807d0201d..76d5fc8355 100755
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -35,7 +35,6 @@
#include "llimview.h"
#include "llcommandhandler.h"
#include "llpanel.h"
-#include "lluictrlfactory.h"
#include "llscrollcontainer.h"
#include "llavatariconctrl.h"
#include "llcallingcard.h" //for LLAvatarTracker
diff --git a/indra/newview/llconfirmationmanager.cpp b/indra/newview/llconfirmationmanager.cpp
index 8ea59fdd83..74ec430aa7 100755
--- a/indra/newview/llconfirmationmanager.cpp
+++ b/indra/newview/llconfirmationmanager.cpp
@@ -28,8 +28,6 @@
#include "llconfirmationmanager.h"
-#include "lluictrlfactory.h"
-
// viewer includes
#include "llnotificationsutil.h"
#include "llstring.h"
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index e9631f757b..ffced584c6 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -37,7 +37,6 @@
#include "llfloaterimcontainer.h"
#include "llfloaterreg.h"
#include "llgroupiconctrl.h"
-#include "lluictrlfactory.h"
#include "lltoolbarview.h"
//
diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp
index b4a1457f47..49a86eba01 100755
--- a/indra/newview/llcurrencyuimanager.cpp
+++ b/indra/newview/llcurrencyuimanager.cpp
@@ -26,7 +26,6 @@
#include "llviewerprecompiledheaders.h"
-#include "lluictrlfactory.h"
#include "lltextbox.h"
#include "lllineeditor.h"
#include "llresmgr.h" // for LLLocale
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 6d4acdcf61..83e6f05088 100755
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -33,7 +33,6 @@
#include "lllandmarkactions.h"
#include "lltoolbarview.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llmenugl.h"
#include "lltooltip.h"
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 7f7add3c70..dc385b5607 100755
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -38,7 +38,6 @@
#include "llnotificationsutil.h"
#include "llslurl.h"
#include "llvoiceclient.h"
-#include "lluictrlfactory.h"
#include "llupdaterservice.h"
#include "llviewertexteditor.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index de79f4913b..5d0cc5ce0e 100755
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -49,7 +49,6 @@
#include "llviewertexturelist.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
-#include "lluictrlfactory.h"
#include "llviewerwindow.h"
#include "llviewerdisplay.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/llfloaterautoreplacesettings.cpp b/indra/newview/llfloaterautoreplacesettings.cpp
index 6e56e929df..1d7ef76ed0 100755
--- a/indra/newview/llfloaterautoreplacesettings.cpp
+++ b/indra/newview/llfloaterautoreplacesettings.cpp
@@ -29,7 +29,6 @@
#include "llagentdata.h"
#include "llcommandhandler.h"
#include "llfloater.h"
-#include "lluictrlfactory.h"
#include "llagent.h"
#include "llpanel.h"
#include "llbutton.h"
diff --git a/indra/newview/llfloateravatar.cpp b/indra/newview/llfloateravatar.cpp
index 31adf5b61e..b65e91fe92 100755
--- a/indra/newview/llfloateravatar.cpp
+++ b/indra/newview/llfloateravatar.cpp
@@ -33,7 +33,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloateravatar.h"
-#include "lluictrlfactory.h"
#include "llmediactrl.h"
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index aab3883c5a..554f5eabff 100755
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -48,7 +48,6 @@
#include "llscrolllistitem.h"
#include "llscrolllistcell.h"
#include "lltabcontainer.h"
-#include "lluictrlfactory.h"
#include "llfocusmgr.h"
#include "lldraghandle.h"
#include "message.h"
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp
index 78807a8e99..11352b566f 100755
--- a/indra/newview/llfloateravatartextures.cpp
+++ b/indra/newview/llfloateravatartextures.cpp
@@ -34,7 +34,6 @@
#include "llagentwearables.h"
#include "llviewerwearable.h"
#include "lltexturectrl.h"
-#include "lluictrlfactory.h"
#include "llviewerobjectlist.h"
#include "llvoavatarself.h"
#include "lllocaltextureobject.h"
diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp
index 316294a477..cb64d70a1d 100755
--- a/indra/newview/llfloaterbeacons.cpp
+++ b/indra/newview/llfloaterbeacons.cpp
@@ -28,7 +28,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterbeacons.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llcheckboxctrl.h"
#include "pipeline.h"
diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp
index 1b65d8d683..2c2334ed4e 100755
--- a/indra/newview/llfloaterbuildoptions.cpp
+++ b/indra/newview/llfloaterbuildoptions.cpp
@@ -32,7 +32,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterbuildoptions.h"
-#include "lluictrlfactory.h"
#include "llcombobox.h"
#include "llselectmgr.h"
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index 8bba98b87f..7dd1f80f12 100755
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -44,7 +44,6 @@
#include "llbutton.h"
#include "lldir.h"
#include "llviewerstats.h"
-#include "lluictrlfactory.h"
#include "llselectmgr.h"
#include "llcheckboxctrl.h"
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
index fa49ad9079..ced61d8b9b 100755
--- a/indra/newview/llfloaterbump.cpp
+++ b/indra/newview/llfloaterbump.cpp
@@ -38,7 +38,6 @@
#include "llpanelblockedlist.h"
#include "llscrolllistctrl.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llviewermessage.h"
#include "llviewermenu.h"
#include "llviewerobjectlist.h"
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
index 5a9cdbba44..c90ccc5819 100755
--- a/indra/newview/llfloaterbuy.cpp
+++ b/indra/newview/llfloaterbuy.cpp
@@ -44,7 +44,6 @@
#include "llselectmgr.h"
#include "llscrolllistctrl.h"
#include "llviewerobject.h"
-#include "lluictrlfactory.h"
#include "llviewerwindow.h"
#include "lltrans.h"
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index b32ac860aa..f4a922a01c 100755
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -50,8 +50,6 @@
#include "llscrolllistctrl.h"
#include "llviewerobject.h"
#include "llviewerregion.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
LLFloaterBuyContents::LLFloaterBuyContents(const LLSD& key)
: LLFloater(key)
diff --git a/indra/newview/llfloaterbuycurrency.cpp b/indra/newview/llfloaterbuycurrency.cpp
index e21a8594bc..7a16e88678 100755
--- a/indra/newview/llfloaterbuycurrency.cpp
+++ b/indra/newview/llfloaterbuycurrency.cpp
@@ -36,8 +36,6 @@
#include "llstatusbar.h"
#include "lltextbox.h"
#include "llviewchildren.h"
-#include "llviewerwindow.h"
-#include "lluictrlfactory.h"
#include "llweb.h"
#include "llwindow.h"
#include "llappviewer.h"
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index 26b1f3b55c..6595b82a21 100755
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -51,7 +51,6 @@
#include "lltrans.h"
#include "llviewchildren.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
#include "llviewertexteditor.h"
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp
index 669ffa7c59..043c92f65f 100755
--- a/indra/newview/llfloaterbvhpreview.cpp
+++ b/indra/newview/llfloaterbvhpreview.cpp
@@ -62,7 +62,6 @@
#include "llviewermenufile.h" // upload_new_resource()
#include "llvoavatar.h"
#include "pipeline.h"
-#include "lluictrlfactory.h"
#include "lltrans.h"
const S32 PREVIEW_BORDER_WIDTH = 2;
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
index 6dd3fdf60c..ab2c199662 100755
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@@ -45,7 +45,6 @@
#include "lllineeditor.h"
#include "v4coloru.h"
#include "llbutton.h"
-#include "lluictrlfactory.h"
#include "llgl.h"
#include "llpointer.h"
#include "llimage.h"
diff --git a/indra/newview/llfloaterfonttest.cpp b/indra/newview/llfloaterfonttest.cpp
index ff27b683b7..99cd90c3e1 100755
--- a/indra/newview/llfloaterfonttest.cpp
+++ b/indra/newview/llfloaterfonttest.cpp
@@ -33,7 +33,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterfonttest.h"
-#include "lluictrlfactory.h"
LLFloaterFontTest::LLFloaterFontTest(const LLSD& key)
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index 37774fbc5c..f68a59f23d 100755
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -67,7 +67,6 @@
#include "llvlcomposition.h"
#include "llsurface.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "lltrans.h"
#include "lltransfertargetfile.h"
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
index dbe7fee108..8eb38d6943 100755
--- a/indra/newview/llfloatergroups.cpp
+++ b/indra/newview/llfloatergroups.cpp
@@ -43,7 +43,6 @@
#include "llscrolllistctrl.h"
#include "llstartup.h"
#include "lltextbox.h"
-#include "lluictrlfactory.h"
#include "lltrans.h"
using namespace LLOldEvents;
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index fb3790f725..e5e49c3903 100755
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -42,7 +42,6 @@
// Linden library includes
#include "llradiogroup.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
#include "llsliderctrl.h"
diff --git a/indra/newview/llfloaterhud.cpp b/indra/newview/llfloaterhud.cpp
index 58c76a0b85..41a0fc14db 100755
--- a/indra/newview/llfloaterhud.cpp
+++ b/indra/newview/llfloaterhud.cpp
@@ -34,7 +34,6 @@
// Linden libs
#include "llnotificationsutil.h"
-#include "lluictrlfactory.h"
///----------------------------------------------------------------------------
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index 52e678ce24..8e534fecc9 100755
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -49,7 +49,6 @@
#include "llviewerobjectlist.h"
#include "llvoavatar.h"
#include "pipeline.h"
-#include "lluictrlfactory.h"
#include "llviewershadermgr.h"
#include "llviewertexturelist.h"
#include "llstring.h"
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index 10088d20c2..319a3123b6 100755
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -41,9 +41,6 @@
#include "lltrans.h"
#include "llviewercontrol.h"
#include "llviewerobject.h"
-#include "lluictrlfactory.h"
-
-//LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
LLFloaterInspect::LLFloaterInspect(const LLSD& key)
: LLFloater(key),
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp
index bb1a16fb8e..46a79a7428 100755
--- a/indra/newview/llfloaterjoystick.cpp
+++ b/indra/newview/llfloaterjoystick.cpp
@@ -36,7 +36,6 @@
#include "lltrace.h"
// project includes
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llappviewer.h"
#include "llviewerjoystick.h"
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp
index f72f2631a1..049de95d8b 100644
--- a/indra/newview/llfloaterlagmeter.cpp
+++ b/indra/newview/llfloaterlagmeter.cpp
@@ -28,7 +28,6 @@
#include "llfloaterlagmeter.h"
-#include "lluictrlfactory.h"
#include "llviewerstats.h"
#include "llviewertexture.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 5da75da749..c5faca72dd 100755
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -63,7 +63,6 @@
#include "lltextbox.h"
#include "lltexturectrl.h"
#include "lluiconstants.h"
-#include "lluictrlfactory.h"
#include "llviewertexturelist.h" // LLUIImageList
#include "llviewermessage.h"
#include "llviewerparcelmgr.h"
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp
index f34760a6bf..8aee958452 100755
--- a/indra/newview/llfloaterlandholdings.cpp
+++ b/indra/newview/llfloaterlandholdings.cpp
@@ -47,7 +47,6 @@
#include "lltrans.h"
#include "lluiconstants.h"
#include "llviewermessage.h"
-#include "lluictrlfactory.h"
#include "llgroupactions.h"
diff --git a/indra/newview/llfloatermediasettings.cpp b/indra/newview/llfloatermediasettings.cpp
index 4fd5c0587a..8c3ed9f2b0 100755
--- a/indra/newview/llfloatermediasettings.cpp
+++ b/indra/newview/llfloatermediasettings.cpp
@@ -32,7 +32,6 @@
#include "llpanelmediasettingssecurity.h"
#include "llpanelmediasettingspermissions.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llselectmgr.h"
#include "llsdutil.h"
diff --git a/indra/newview/llfloatermemleak.cpp b/indra/newview/llfloatermemleak.cpp
index 9edfe1e354..24f8ea132d 100755
--- a/indra/newview/llfloatermemleak.cpp
+++ b/indra/newview/llfloatermemleak.cpp
@@ -28,7 +28,6 @@
#include "llfloatermemleak.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llspinctrl.h"
#include "llresmgr.h"
diff --git a/indra/newview/llfloatermessagebuilder.cpp b/indra/newview/llfloatermessagebuilder.cpp
index 59a4adc95b..ad0b1997cf 100644
--- a/indra/newview/llfloatermessagebuilder.cpp
+++ b/indra/newview/llfloatermessagebuilder.cpp
@@ -17,7 +17,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloatermessagebuilder.h"
-#include "lluictrlfactory.h"
#include "llmessagetemplate.h"
#include "llagent.h"
#include "llviewerregion.h" // getHandle
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 94ec4ec6e6..2d40493c79 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -63,7 +63,6 @@
#include "llvoavatar.h"
#include "llvoavatarself.h"
#include "pipeline.h"
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llviewermenu.h"
#include "llviewermenufile.h"
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp
index 0cca715fe2..63694f27cc 100755
--- a/indra/newview/llfloaternamedesc.cpp
+++ b/indra/newview/llfloaternamedesc.cpp
@@ -42,8 +42,6 @@
#include "llfloaterperms.h"
#include "llviewercontrol.h"
#include "llviewermenufile.h" // upload_new_resource()
-#include "lluictrlfactory.h"
-#include "llstring.h"
#include "lleconomy.h"
#include "llpermissions.h"
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index ad5a16004e..88057d3b4e 100755
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -27,7 +27,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaternotificationsconsole.h"
#include "llnotifications.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llscrolllistctrl.h"
#include "llscrolllistitem.h"
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index 321478779c..46865b1519 100755
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -47,8 +47,6 @@
#include "llselectmgr.h"
#include "lluiconstants.h"
#include "llviewerobject.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key)
diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp
index 3a6b9ab9af..4d90f54276 100755
--- a/indra/newview/llfloaterpay.cpp
+++ b/indra/newview/llfloaterpay.cpp
@@ -50,7 +50,6 @@
#include "llbutton.h"
#include "llselectmgr.h"
#include "lltransactiontypes.h"
-#include "lluictrlfactory.h"
///----------------------------------------------------------------------------
/// Local function declarations, constants, enums, and typedefs
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index f9953002b6..f9329014c8 100755
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -33,7 +33,6 @@
#include "llnotificationsutil.h"
#include "llpermissions.h"
#include "llsdserialize.h"
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llviewerregion.h"
#include "llviewerwindow.h"
diff --git a/indra/newview/llfloaterpostprocess.cpp b/indra/newview/llfloaterpostprocess.cpp
index 2d61109e17..18b17e1c1b 100755
--- a/indra/newview/llfloaterpostprocess.cpp
+++ b/indra/newview/llfloaterpostprocess.cpp
@@ -31,7 +31,6 @@
#include "llsliderctrl.h"
#include "llcheckboxctrl.h"
#include "llnotificationsutil.h"
-#include "lluictrlfactory.h"
#include "llviewerdisplay.h"
#include "llpostprocess.h"
#include "llcombobox.h"
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 31e735235c..76fa3604bc 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -109,7 +109,6 @@
#include "llwindow.h"
#include "llworld.h"
#include "pipeline.h"
-#include "lluictrlfactory.h"
#include "llviewermedia.h"
#include "llpluginclassmedia.h"
#include "llteleporthistorystorage.h"
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 643fe989f6..02d6740f67 100755
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -58,8 +58,6 @@
#include "llviewerwindow.h"
#include "llgroupactions.h"
-#include "lluictrlfactory.h"
-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLPropertiesObserver
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index ee8c09c4c6..8cc007e0b9 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -78,7 +78,6 @@
#include "lltexturectrl.h"
#include "lltrans.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llviewerinventory.h"
#include "llviewertexture.h"
#include "llviewertexturelist.h"
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 17b5a89d24..dc7697bcb9 100755
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -75,7 +75,6 @@
#include "lldir.h"
#include "llselectmgr.h"
#include "llversioninfo.h"
-#include "lluictrlfactory.h"
#include "llviewernetwork.h"
#include "llassetuploadresponders.h"
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp
index eeaf2a3144..4c7e7b894f 100755
--- a/indra/newview/llfloaterscriptdebug.cpp
+++ b/indra/newview/llfloaterscriptdebug.cpp
@@ -29,7 +29,6 @@
#include "llfloaterscriptdebug.h"
#include "llfloaterreg.h"
-#include "lluictrlfactory.h"
#include "llfontgl.h"
#include "llrect.h"
#include "llerror.h"
diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp
index a410a3437a..3b0ce2f7e8 100755
--- a/indra/newview/llfloaterscriptlimits.cpp
+++ b/indra/newview/llfloaterscriptlimits.cpp
@@ -46,7 +46,6 @@
#include "lltracker.h"
#include "lltrans.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
#include "llviewerwindow.h"
diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
index 0cb37dabe7..0e0d3d85fc 100755
--- a/indra/newview/llfloatersellland.cpp
+++ b/indra/newview/llfloatersellland.cpp
@@ -39,8 +39,6 @@
#include "lltexturectrl.h"
#include "llviewercontrol.h"
#include "llviewerparcelmgr.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
#include "lltrans.h"
class LLAvatarName;
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index e5017c7315..2b62c30a4f 100755
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -27,7 +27,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloatersettingsdebug.h"
#include "llfloater.h"
-#include "lluictrlfactory.h"
#include "llcombobox.h"
#include "llspinctrl.h"
#include "llcolorswatch.h"
diff --git a/indra/newview/llfloatertelehub.cpp b/indra/newview/llfloatertelehub.cpp
index b845fd132d..e35aaf79ff 100755
--- a/indra/newview/llfloatertelehub.cpp
+++ b/indra/newview/llfloatertelehub.cpp
@@ -41,7 +41,6 @@
#include "lltoolmgr.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
-#include "lluictrlfactory.h"
LLFloaterTelehub::LLFloaterTelehub(const LLSD& key)
: LLFloater(key),
diff --git a/indra/newview/llfloatertexturefetchdebugger.cpp b/indra/newview/llfloatertexturefetchdebugger.cpp
index 9a23d99802..5671cff2a7 100755
--- a/indra/newview/llfloatertexturefetchdebugger.cpp
+++ b/indra/newview/llfloatertexturefetchdebugger.cpp
@@ -28,10 +28,8 @@
#include "llfloatertexturefetchdebugger.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llspinctrl.h"
-#include "llresmgr.h"
#include "llmath.h"
#include "llviewerwindow.h"
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index d405db6466..4d23e61029 100755
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -88,7 +88,6 @@
#include "llvograss.h"
#include "llvotree.h"
#include "llvovolume.h"
-#include "lluictrlfactory.h"
#include "llmeshrepository.h"
#include "qtoolalign.h" // <alchemy/>
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index 56076c554b..47e3130a1a 100755
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -48,8 +48,6 @@
#include "llviewermessage.h"
#include "llviewerparcelmgr.h"
#include "llviewerregion.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
#include "llfloaterregioninfo.h"
//LLFloaterTopObjects* LLFloaterTopObjects::sInstance = NULL;
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
index ae33acb842..b3e23282b0 100755
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -41,7 +41,6 @@
#include "llradiogroup.h"
#include "lltextbox.h"
#include "llui.h"
-#include "lluictrlfactory.h"
#include "llvfile.h"
#include "message.h"
#include "llstartup.h" // login_alert_done
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp
index 2b3e5f561b..5baecf2196 100755
--- a/indra/newview/llfloaterurlentry.cpp
+++ b/indra/newview/llfloaterurlentry.cpp
@@ -37,7 +37,6 @@
#include "llmimetypes.h"
#include "llnotificationsutil.h"
#include "llurlhistory.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
#include "llviewerwindow.h"
diff --git a/indra/newview/llfloaterwhitelistentry.cpp b/indra/newview/llfloaterwhitelistentry.cpp
index 2a499f681b..27080a87ae 100755
--- a/indra/newview/llfloaterwhitelistentry.cpp
+++ b/indra/newview/llfloaterwhitelistentry.cpp
@@ -30,7 +30,6 @@
#include "llfloatermediasettings.h"
#include "llfloaterwhitelistentry.h"
#include "llpanelmediasettingssecurity.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
#include "llviewerwindow.h"
#include "lllineeditor.h"
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 910d0924bb..b248b25356 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -68,7 +68,6 @@
#include "llworldmap.h"
#include "llworldmapmessage.h"
#include "llworldmapview.h"
-#include "lluictrlfactory.h"
#include "llappviewer.h"
#include "llmapimagetype.h"
#include "llweb.h"
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 1a6e457d57..8b63a085f1 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -33,7 +33,6 @@
#include "llgroupmgr.h"
-#include <vector>
#include <algorithm>
#include "llappviewer.h"
@@ -49,9 +48,9 @@
#include "llpanelgroup.h"
#include "llgroupactions.h"
#include "llnotificationsutil.h"
-#include "lluictrlfactory.h"
#include "lltrans.h"
#include "llviewerregion.h"
+
#include <boost/regex.hpp>
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp
index eb48c0fc3a..4cf2a3e1ff 100755
--- a/indra/newview/llhudview.cpp
+++ b/indra/newview/llhudview.cpp
@@ -40,7 +40,6 @@
#include "lltracker.h"
#include "llviewercamera.h"
#include "llui.h"
-#include "lluictrlfactory.h"
LLHUDView *gHUDView = NULL;
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 59d7e2cab2..bd1cad9da4 100755
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -42,7 +42,6 @@
#include "llstring.h"
#include "lltextutil.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llfloaterimsessiontab.h"
#include "llagent.h"
#include "llagentui.h"
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 4944afd7a8..cc2b46bc94 100755
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -78,12 +78,10 @@
#include "lltabcontainer.h"
#include "lltooldraganddrop.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llviewermessage.h"
#include "llviewerfoldertype.h"
#include "llviewerobjectlist.h"
#include "llviewerregion.h"
-#include "llviewerwindow.h"
#include "llvoavatarself.h"
#include "llwearablelist.h"
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 1231e72dbf..e01c67b79e 100755
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -36,7 +36,6 @@
#include "llinventoryfilter.h"
#include "llinventorymodel.h"
#include "llscrollcontainer.h"
-#include "lluictrlfactory.h"
#include <set>
class LLInvFVBridge;
diff --git a/indra/newview/llpanelavatartag.cpp b/indra/newview/llpanelavatartag.cpp
index 884680b87d..fb99c98b98 100755
--- a/indra/newview/llpanelavatartag.cpp
+++ b/indra/newview/llpanelavatartag.cpp
@@ -28,7 +28,6 @@
#include "llpanelavatartag.h"
-#include "lluictrlfactory.h"
#include "llavatariconctrl.h"
#include "lltextbox.h"
diff --git a/indra/newview/llpanelexperiences.cpp b/indra/newview/llpanelexperiences.cpp
index 3ee4b5e968..93b3c3277c 100644
--- a/indra/newview/llpanelexperiences.cpp
+++ b/indra/newview/llpanelexperiences.cpp
@@ -29,7 +29,6 @@
#include "llpanelprofile.h"
-#include "lluictrlfactory.h"
#include "llexperiencecache.h"
#include "llagent.h"
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index d72690ba18..a1c71ac967 100755
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -64,7 +64,6 @@
#include "llviewerregion.h"
#include "llviewerstats.h"
#include "llvovolume.h"
-#include "lluictrlfactory.h"
#include "llpluginclassmedia.h"
#include "llviewertexturelist.h"// Update sel manager as to which channel we're editing so it can reflect the correct overlay UI
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index e775125ed7..feac7a7211 100755
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -28,13 +28,16 @@
#include "llpanelgroup.h"
// Library includes
+#include "llaccordionctrltab.h"
+#include "llaccordionctrl.h"
#include "llbutton.h"
-#include "llfloatersidepanelcontainer.h"
#include "lltabcontainer.h"
#include "lltextbox.h"
-#include "lluictrlfactory.h"
+#include "lltrans.h"
// Viewer includes
+#include "llagent.h"
+#include "llfloatersidepanelcontainer.h"
#include "llviewermessage.h"
#include "llviewerwindow.h"
#include "llappviewer.h"
@@ -43,18 +46,12 @@
#include "llfloater.h"
#include "llgroupactions.h"
-#include "llagent.h"
-
#include "llsidetraypanelcontainer.h"
#include "llpanelgroupnotices.h"
#include "llpanelgroupgeneral.h"
#include "llpanelgrouproles.h"
-#include "llaccordionctrltab.h"
-#include "llaccordionctrl.h"
-
-#include "lltrans.h"
static LLPanelInjector<LLPanelGroup> t_panel_group("panel_group_info_sidetray");
diff --git a/indra/newview/llpanelgroupbulk.cpp b/indra/newview/llpanelgroupbulk.cpp
index cffda02aa0..a18e45725e 100644
--- a/indra/newview/llpanelgroupbulk.cpp
+++ b/indra/newview/llpanelgroupbulk.cpp
@@ -45,8 +45,6 @@
#include "lltextbox.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
//////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llpanelgroupbulkban.cpp b/indra/newview/llpanelgroupbulkban.cpp
index fe0e284f8b..f34244e271 100644
--- a/indra/newview/llpanelgroupbulkban.cpp
+++ b/indra/newview/llpanelgroupbulkban.cpp
@@ -46,8 +46,6 @@
#include "lltextbox.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
LLPanelGroupBulkBan::LLPanelGroupBulkBan(const LLUUID& group_id) : LLPanelGroupBulk(group_id)
{
diff --git a/indra/newview/llpanelgroupexperiences.cpp b/indra/newview/llpanelgroupexperiences.cpp
index 76b68122fb..5810b59d59 100644
--- a/indra/newview/llpanelgroupexperiences.cpp
+++ b/indra/newview/llpanelgroupexperiences.cpp
@@ -28,7 +28,6 @@
#include "llpanelgroupexperiences.h"
-#include "lluictrlfactory.h"
#include "roles_constants.h"
#include "llhttpclient.h"
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 85539fb0d9..24f10be341 100755
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -32,7 +32,6 @@
#include "llagent.h"
#include "lleconomy.h"
#include "llsdparam.h"
-#include "lluictrlfactory.h"
#include "roles_constants.h"
// UI elements
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index 5f5bc89f77..2c7ef76090 100755
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -42,8 +42,6 @@
#include "lltextbox.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
class LLPanelGroupInvite::impl
{
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index 71b49701bc..02576c940a 100755
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -50,7 +50,6 @@
#include "lltrans.h"
#include "lltransactiontypes.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llstatusbar.h"
#include "llfloaterworldmap.h"
diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp
index acdb16f432..2ad00e3a4d 100755
--- a/indra/newview/llpanelland.cpp
+++ b/indra/newview/llpanelland.cpp
@@ -42,8 +42,6 @@
#include "llviewerwindow.h"
#include "roles_constants.h"
-#include "lluictrlfactory.h"
-
LLPanelLandSelectObserver* LLPanelLandInfo::sObserver = NULL;
LLPanelLandInfo* LLPanelLandInfo::sInstance = NULL;
diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp
index 73cd053095..8a30a6cc08 100755
--- a/indra/newview/llpanellandmedia.cpp
+++ b/indra/newview/llpanellandmedia.cpp
@@ -35,7 +35,6 @@
#include "llviewerregion.h"
#include "llviewermedia.h"
#include "llviewerparcelmedia.h"
-#include "lluictrlfactory.h"
// library includes
#include "llcheckboxctrl.h"
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index cf25012e3b..54a245a1a2 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -58,7 +58,6 @@
#include "llviewermenu.h" // for handle_preferences()
#include "llviewernetwork.h"
#include "llviewerwindow.h" // to link into child list
-#include "lluictrlfactory.h"
#include "llhttpclient.h"
#include "llweb.h"
#include "llmediactrl.h"
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp
index d7c43c224c..e6c0834dac 100755
--- a/indra/newview/llpanelmediasettingsgeneral.cpp
+++ b/indra/newview/llpanelmediasettingsgeneral.cpp
@@ -33,11 +33,9 @@
#include "llcheckboxctrl.h"
#include "llnotificationsutil.h"
#include "llspinctrl.h"
-#include "lluictrlfactory.h"
// project includes
#include "llagent.h"
-#include "llviewerwindow.h"
#include "llviewermedia.h"
#include "llsdutil.h"
#include "llselectmgr.h"
diff --git a/indra/newview/llpanelmediasettingspermissions.cpp b/indra/newview/llpanelmediasettingspermissions.cpp
index cb0b7789ff..577f51e891 100755
--- a/indra/newview/llpanelmediasettingspermissions.cpp
+++ b/indra/newview/llpanelmediasettingspermissions.cpp
@@ -36,9 +36,6 @@
#include "llcheckboxctrl.h"
#include "llspinctrl.h"
#include "llurlhistory.h"
-#include "lluictrlfactory.h"
-#include "llwindow.h"
-#include "llviewerwindow.h"
#include "llsdutil.h"
#include "llselectmgr.h"
#include "llmediaentry.h"
diff --git a/indra/newview/llpanelmediasettingssecurity.cpp b/indra/newview/llpanelmediasettingssecurity.cpp
index b588e8f930..270be79811 100755
--- a/indra/newview/llpanelmediasettingssecurity.cpp
+++ b/indra/newview/llpanelmediasettingssecurity.cpp
@@ -34,7 +34,6 @@
#include "llnotificationsutil.h"
#include "llscrolllistctrl.h"
#include "llscrolllistitem.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
#include "llviewerwindow.h"
#include "llsdutil.h"
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 64ad481ac0..ff5fd9ef24 100755
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -66,7 +66,6 @@
#include "llworld.h"
#include "pipeline.h"
#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
//#include "llfirstuse.h"
#include "lldrawpool.h"
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 1ff9aaf6f7..1e743da1d6 100755
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -64,7 +64,6 @@
#include "lltextbox.h"
#include "lltoggleablemenu.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llsdutil.h"
#include "llsidepanelappearance.h"
#include "lltoggleablemenu.h"
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index f95f94a3f7..3d71e68a80 100755
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -39,7 +39,6 @@
#include "llfiltereditor.h"
#include "lltabcontainer.h"
#include "lltoggleablemenu.h"
-#include "lluictrlfactory.h"
#include "llpanelpeople.h"
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index d6033b7f88..6cebb231c1 100755
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -28,7 +28,6 @@
// libs
#include "llmenugl.h"
-#include "lluictrlfactory.h"
#include "llpanelpeoplemenus.h"
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 29fc2b2d03..313a8f0088 100755
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -59,7 +59,6 @@
#include "llnamebox.h"
#include "llviewercontrol.h"
#include "llviewernetwork.h"
-#include "lluictrlfactory.h"
#include "llspinctrl.h"
#include "roles_constants.h"
#include "llgroupactions.h"
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index a9a0c30e26..edbfeacb93 100755
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -45,7 +45,6 @@
#include "lltabcontainer.h"
#include "lltexteditor.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llwindow.h"
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index f42df221e4..cfd27c7b65 100755
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -34,8 +34,6 @@
#include "llmediaentry.h"
#include "llrender.h"
#include "lldrawable.h"
-#include "llviewerwindow.h"
-#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llface.h"
#include "llcombobox.h"
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h
index b88861c5c6..49a7c57f59 100755
--- a/indra/newview/llpanelteleporthistory.h
+++ b/indra/newview/llpanelteleporthistory.h
@@ -28,8 +28,6 @@
#ifndef LL_LLPANELTELEPORTHISTORY_H
#define LL_LLPANELTELEPORTHISTORY_H
-#include "lluictrlfactory.h"
-
#include "llpanelplacestab.h"
#include "llteleporthistory.h"
#include "llmenugl.h"
diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
index 3946d6a63b..341c90c4cf 100755
--- a/indra/newview/llpanelvoicedevicesettings.cpp
+++ b/indra/newview/llpanelvoicedevicesettings.cpp
@@ -36,9 +36,6 @@
#include "llvoiceclient.h"
#include "llvoicechannel.h"
-// Library includes (after viewer)
-#include "lluictrlfactory.h"
-
static LLPanelInjector<LLPanelVoiceDeviceSettings> t_panel_group_general("panel_voice_device_settings");
static const std::string DEFAULT_DEVICE("Default");
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 48fd6247d4..74ade2a593 100755
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -71,7 +71,6 @@
#include "llnotificationsutil.h"
#include "lldrawpool.h"
-#include "lluictrlfactory.h"
// For mesh physics
#include "llagent.h"
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
index 35ac0537a3..3b5ca36cd8 100755
--- a/indra/newview/llpreviewanim.cpp
+++ b/indra/newview/llpreviewanim.cpp
@@ -35,8 +35,6 @@
#include "llkeyframemotion.h"
#include "llfilepicker.h"
#include "lllineeditor.h"
-#include "lluictrlfactory.h"
-#include "lluictrlfactory.h"
extern LLAgent gAgent;
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 1cb54554d5..5c24f344ce 100755
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -58,7 +58,6 @@
#include "llviewercontrol.h" // gSavedSettings
#include "llappviewer.h" // app_abort_quit()
#include "lllineeditor.h"
-#include "lluictrlfactory.h"
///----------------------------------------------------------------------------
/// Class LLPreviewNotecard
diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp
index 105c5e8cbe..9e7e9a8103 100755
--- a/indra/newview/llpreviewsound.cpp
+++ b/indra/newview/llpreviewsound.cpp
@@ -35,7 +35,6 @@
#include "llresmgr.h"
#include "llviewercontrol.h"
#include "llviewermessage.h" // send_guid_sound_trigger
-#include "lluictrlfactory.h"
extern LLAudioEngine* gAudiop;
extern LLAgent gAgent;
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 81a1c6f266..544d3c9c54 100755
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -51,8 +51,6 @@
#include "llviewerinventory.h"
#include "llviewertexture.h"
#include "llviewertexturelist.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
#include "lllineeditor.h"
const S32 CLIENT_RECT_VPAD = 4;
diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp
index 2824c70582..dcbd507932 100755
--- a/indra/newview/llsearchcombobox.cpp
+++ b/indra/newview/llsearchcombobox.cpp
@@ -29,7 +29,6 @@
#include "llkeyboard.h"
#include "lltrans.h" // for LLTrans::getString()
-#include "lluictrlfactory.h"
static LLDefaultChildRegistry::Register<LLSearchComboBox> r1("search_combo_box");
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index ea7cf82674..02c5a5bde7 100755
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -43,7 +43,6 @@
#include "llpaneleditwearable.h"
#include "llpaneloutfitsinventory.h"
#include "lltextbox.h"
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llviewerregion.h"
#include "llvoavatarself.h"
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 6f864fe8e6..86acb98905 100755
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -66,7 +66,6 @@
#include "llviewermenu.h" // for gMenuBarView
#include "llviewerparcelmgr.h"
#include "llviewerthrottle.h"
-#include "lluictrlfactory.h"
#include "lltoolmgr.h"
#include "llfocusmgr.h"
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index aa019dfdd8..dfdc9b0c27 100755
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -38,7 +38,6 @@
#include "llviewercamera.h"
#include "llviewermedia.h"
#include "llhudview.h"
-#include "lluictrlfactory.h"
#include "lldrawable.h"
#include "llparcel.h"
#include "llviewerparcelmgr.h"
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 8377fc6bf5..b80729e385 100755
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -49,7 +49,6 @@
#include "llstatusbar.h"
#include "llviewercontrol.h" // gSavedSettings
#include "llviewertexturelist.h"
-#include "lluictrlfactory.h"
#include "llvfile.h"
#include "llvfs.h"
#include "llviewerinventory.h"
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 6ef35f0b5b..6f204cb309 100755
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -55,7 +55,6 @@
#include "lltooldraganddrop.h"
#include "lltooltip.h"
#include "lltrans.h"
-#include "lluictrlfactory.h"
#include "llviewerassettype.h"
#include "llviewercontrol.h"
#include "llviewerinventory.h"
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index db032822c1..468508f6b4 100755
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -38,7 +38,6 @@
#include "llsliderctrl.h"
#include "llspinctrl.h"
#include "llcheckboxctrl.h"
-#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llviewercamera.h"
#include "llcombobox.h"
diff --git a/indra/newview/llwaterparamset.cpp b/indra/newview/llwaterparamset.cpp
index 9cc91d2246..7418a92668 100755
--- a/indra/newview/llwaterparamset.cpp
+++ b/indra/newview/llwaterparamset.cpp
@@ -30,7 +30,6 @@
#include "llsd.h"
#include "llwaterparammanager.h"
-#include "lluictrlfactory.h"
#include "llsliderctrl.h"
#include "llviewertexturelist.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index 040024f86b..167cb4e18b 100755
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -36,7 +36,6 @@
#include "llsliderctrl.h"
#include "llspinctrl.h"
#include "llcheckboxctrl.h"
-#include "lluictrlfactory.h"
#include "llviewercamera.h"
#include "llcombobox.h"
#include "lllineeditor.h"
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp
index 46d3433c93..1438aa7eb8 100755
--- a/indra/newview/llwlparamset.cpp
+++ b/indra/newview/llwlparamset.cpp
@@ -31,7 +31,6 @@
#include "llwlparammanager.h"
#include "llglslshader.h"
-#include "lluictrlfactory.h"
#include "llsliderctrl.h"
#include "pipeline.h"
--
GitLab