diff --git a/indra/newview/dialogstack.h b/indra/newview/dialogstack.h index e5ce347595..bf71c33b03 100644 --- a/indra/newview/dialogstack.h +++ b/indra/newview/dialogstack.h @@ -27,8 +27,6 @@ #include "llsingleton.h" -#include - class DialogStack : public LLSingleton { diff --git a/indra/newview/fsareasearch.h b/indra/newview/fsareasearch.h index 25600b7788..c8e53299cb 100644 --- a/indra/newview/fsareasearch.h +++ b/indra/newview/fsareasearch.h @@ -30,8 +30,6 @@ #include "llfloater.h" #include "llsingleton.h" -#include "lluuid.h" -#include "llstring.h" #include "llframetimer.h" #include "llsaleinfo.h" #include "llcategory.h" diff --git a/indra/newview/fsconsoleutils.cpp b/indra/newview/fsconsoleutils.cpp index e1d34b9c53..db2bd46f0e 100644 --- a/indra/newview/fsconsoleutils.cpp +++ b/indra/newview/fsconsoleutils.cpp @@ -33,13 +33,12 @@ #include "fsfloaternearbychat.h" #include "lggcontactsets.h" #include "llagent.h" +#include "llavatarnamecache.h" #include "llconsole.h" #include "llfloaterreg.h" #include "llimview.h" -#include "llnotificationhandler.h" #include "lltrans.h" #include "llviewercontrol.h" -#include "rlvhandler.h" // static BOOL FSConsoleUtils::isNearbyChatVisible() diff --git a/indra/newview/fsconsoleutils.h b/indra/newview/fsconsoleutils.h index 29ca471aa2..03e74a34b2 100644 --- a/indra/newview/fsconsoleutils.h +++ b/indra/newview/fsconsoleutils.h @@ -28,8 +28,8 @@ #ifndef FS_CONSOLEUTILS_H #define FS_CONSOLEUTILS_H -#include "llavatarnamecache.h" -#include "llviewerchat.h" +class LLAvatarName; +class LLChat; class FSConsoleUtils { diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp index a12bb48d44..23e885fe27 100644 --- a/indra/newview/fsdata.cpp +++ b/indra/newview/fsdata.cpp @@ -47,7 +47,6 @@ #include "llimview.h" #include "llmutelist.h" #include "llnotifications.h" -#include "llprimitive.h" #include "llsdserialize.h" #include "llversioninfo.h" #include "llviewercontrol.h" diff --git a/indra/newview/fsdata.h b/indra/newview/fsdata.h index 8681278954..f1c676d66f 100644 --- a/indra/newview/fsdata.h +++ b/indra/newview/fsdata.h @@ -28,10 +28,7 @@ #ifndef FS_DATA_H #define FS_DATA_H -#include - #include "llinstantmessage.h" -#include "llsd.h" #include "llsingleton.h" class FSData : public LLSingleton diff --git a/indra/newview/fsfloaterblocklist.cpp b/indra/newview/fsfloaterblocklist.cpp index 902ab20494..7e1b5f19ba 100644 --- a/indra/newview/fsfloaterblocklist.cpp +++ b/indra/newview/fsfloaterblocklist.cpp @@ -28,7 +28,6 @@ #include "llviewerprecompiledheaders.h" #include "fsfloaterblocklist.h" -#include "llviewercontrol.h" FSFloaterBlocklist::FSFloaterBlocklist(const LLSD& seed) : LLFloater(seed), diff --git a/indra/newview/fsfloaterblocklist.h b/indra/newview/fsfloaterblocklist.h index 572a8d8425..bf14dcf1d1 100644 --- a/indra/newview/fsfloaterblocklist.h +++ b/indra/newview/fsfloaterblocklist.h @@ -30,8 +30,6 @@ #include "llfloater.h" -#include "llpanelblockedlist.h" - class FSFloaterBlocklist : public LLFloater { public: diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp index 6d56c8c1e9..ebde38d378 100644 --- a/indra/newview/fsfloatercontacts.cpp +++ b/indra/newview/fsfloatercontacts.cpp @@ -32,7 +32,6 @@ // libs #include "llagent.h" -#include "llavatarname.h" #include "llfloaterreg.h" #include "lltabcontainer.h" #include "llscrolllistctrl.h" @@ -47,7 +46,6 @@ #include "llgrouplist.h" #include "fsfloaterimcontainer.h" #include "llnotificationsutil.h" -#include "llfloatersidepanelcontainer.h" #include "llstartup.h" #include "llviewercontrol.h" #include "llvoiceclient.h" diff --git a/indra/newview/fsfloatercontacts.h b/indra/newview/fsfloatercontacts.h index e9c273244d..aa5e476ca6 100644 --- a/indra/newview/fsfloatercontacts.h +++ b/indra/newview/fsfloatercontacts.h @@ -30,8 +30,6 @@ #define FS_FLOATERCONTACTS_H #include "llfloater.h" -#include "lleventtimer.h" -#include "llcallingcard.h" class LLAvatarList; class LLAvatarName; diff --git a/indra/newview/fsfloatergroup.cpp b/indra/newview/fsfloatergroup.cpp index e398c29146..612711bdd5 100644 --- a/indra/newview/fsfloatergroup.cpp +++ b/indra/newview/fsfloatergroup.cpp @@ -30,6 +30,7 @@ #include "fsfloatergroup.h" #include "llfloaterreg.h" +#include "llpanelgroup.h" FSFloaterGroup::FSFloaterGroup(const LLSD& seed) : LLFloater(seed), diff --git a/indra/newview/fsfloatergroup.h b/indra/newview/fsfloatergroup.h index a8d5e47fb5..bb0799f605 100644 --- a/indra/newview/fsfloatergroup.h +++ b/indra/newview/fsfloatergroup.h @@ -29,7 +29,6 @@ #define FS_FLOATERGROUP_H #include "llfloater.h" -#include "llpanelgroup.h" class LLPanelGroup; diff --git a/indra/newview/fsfloatergrouptitles.cpp b/indra/newview/fsfloatergrouptitles.cpp index f9f4a0ff50..738f6a7a80 100644 --- a/indra/newview/fsfloatergrouptitles.cpp +++ b/indra/newview/fsfloatergrouptitles.cpp @@ -28,8 +28,7 @@ #include "fsfloatergrouptitles.h" #include "llgroupactions.h" -#include "llscrolllistitem.h" -#include "llviewermessage.h" +#include "llscrolllistctrl.h" #include "lltrans.h" ///////////////////////////////////////////////////// diff --git a/indra/newview/fsfloatergrouptitles.h b/indra/newview/fsfloatergrouptitles.h index 5ca1e1b9cf..5b1e643c01 100644 --- a/indra/newview/fsfloatergrouptitles.h +++ b/indra/newview/fsfloatergrouptitles.h @@ -30,12 +30,12 @@ #include "llsingleton.h" #include "llfloater.h" -#include "llscrolllistctrl.h" #include "llagent.h" #include "llgroupmgr.h" class FSFloaterGroupTitles; +class LLScrollListCtrl; class FSGroupTitlesObserver : LLGroupMgrObserver { diff --git a/indra/newview/fsfloaterwsassetblacklist.cpp b/indra/newview/fsfloaterwsassetblacklist.cpp index a6b12aedcd..d1e7dec5c5 100644 --- a/indra/newview/fsfloaterwsassetblacklist.cpp +++ b/indra/newview/fsfloaterwsassetblacklist.cpp @@ -104,7 +104,7 @@ void FSFloaterWSAssetBlacklist::removeElementFromList(const LLUUID& id) void FSFloaterWSAssetBlacklist::onOpen(const LLSD& key) -{ +{ mResultList->clearRows(); buildBlacklist(); } @@ -112,7 +112,7 @@ void FSFloaterWSAssetBlacklist::onOpen(const LLSD& key) BOOL FSFloaterWSAssetBlacklist::postBuild() { mResultList = getChild("result_list"); - childSetAction("remove_btn", boost::bind(&FSFloaterWSAssetBlacklist::onRemoveBtn, this)); + childSetAction("remove_btn", boost::bind(&FSFloaterWSAssetBlacklist::onRemoveBtn, this)); std::string order_by = gSavedSettings.getString("FSFloaterBlacklistSortColumn"); BOOL ascending = gSavedSettings.getBOOL("FSFloaterBlacklistSortAscending"); @@ -121,7 +121,7 @@ BOOL FSFloaterWSAssetBlacklist::postBuild() mResultList->sortByColumn(order_by, ascending); } - return TRUE; + return TRUE; } void FSFloaterWSAssetBlacklist::onRemoveBtn() @@ -138,5 +138,5 @@ void FSFloaterWSAssetBlacklist::onRemoveBtn() void FSFloaterWSAssetBlacklist::onCancelBtn() { - closeFloater(); + closeFloater(); } diff --git a/indra/newview/fsfloaterwsassetblacklist.h b/indra/newview/fsfloaterwsassetblacklist.h index 80ba4a7aa8..171e4f96b1 100644 --- a/indra/newview/fsfloaterwsassetblacklist.h +++ b/indra/newview/fsfloaterwsassetblacklist.h @@ -34,13 +34,13 @@ class LLScrollListCtrl; class FSFloaterWSAssetBlacklist : public LLFloater { - LOG_CLASS(FSFloaterWSAssetBlacklist); + LOG_CLASS(FSFloaterWSAssetBlacklist); public: - FSFloaterWSAssetBlacklist(const LLSD& key); - virtual ~FSFloaterWSAssetBlacklist(); + FSFloaterWSAssetBlacklist(const LLSD& key); + virtual ~FSFloaterWSAssetBlacklist(); - /*virtual*/ void onOpen(const LLSD& key); - /*virtual*/ BOOL postBuild(); + /*virtual*/ void onOpen(const LLSD& key); + /*virtual*/ BOOL postBuild(); std::string getTypeString(S32 type); void buildBlacklist(); @@ -48,8 +48,8 @@ public: void removeElementFromList(const LLUUID& id); protected: - void onRemoveBtn(); - void onCancelBtn(); + void onRemoveBtn(); + void onCancelBtn(); private: LLScrollListCtrl* mResultList; diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index 9b73ec976f..ca5d7e3491 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -26,40 +26,23 @@ */ #include "llviewerprecompiledheaders.h" + +#include "fscommon.h" #include "fslslbridge.h" #include "fslslbridgerequest.h" -//#include "imageids.h" -#include "llxmlnode.h" -#include "apr_base64.h" // For getScriptInfo() -#include "llbufferstream.h" -#include "llsdserialize.h" -#include "llviewerinventory.h" -#include "llagent.h" -#include "llvoavatar.h" -#include "llattachmentsmgr.h" -#include "llinventorymodel.h" -#include "llinventoryfunctions.h" -#include "llviewerassettype.h" -#include "llfloaterreg.h" -#include "llinventorybridge.h" -#include "llpreviewscript.h" -#include "llselectmgr.h" -#include "llinventorydefines.h" -#include "llviewerregion.h" -#include "llfoldertype.h" -#include "llhttpclient.h" -#include "llassetuploadresponders.h" -#include "llnotificationmanager.h" -#include "llviewerobject.h" -#include "llappearancemgr.h" -#include "lltrans.h" -#include "aoengine.h" -#include "fscommon.h" -#include -#include -#include -#include +#include "aoengine.h" +#include "apr_base64.h" // For getScriptInfo() +#include "llagent.h" +#include "llattachmentsmgr.h" +#include "llappearancemgr.h" +#include "llinventoryfunctions.h" +#include "llpreviewscript.h" +#include "lltrans.h" +#include "llviewercontrol.h" +#include "llviewerregion.h" + +//#include #if OPENSIM #include "llviewernetwork.h" diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h index b09d69b768..2ed3329f28 100644 --- a/indra/newview/fslslbridge.h +++ b/indra/newview/fslslbridge.h @@ -28,15 +28,13 @@ #ifndef FS_LSLBRIDGE_H #define FS_LSLBRIDGE_H -#include "llviewerprecompiledheaders.h" -#include "llchat.h" #include "llhttpclient.h" #include "llinventorymodel.h" -#include "fslslbridgerequest.h" #include "llviewerinventory.h" #include "llinventoryobserver.h" #include "lleventtimer.h" -#include "llvoinventorylistener.h" + +class FSLSLBridgeRequestResponder; // //-TT Client LSL Bridge File diff --git a/indra/newview/fsmoneytracker.cpp b/indra/newview/fsmoneytracker.cpp index b480379713..150edba7da 100644 --- a/indra/newview/fsmoneytracker.cpp +++ b/indra/newview/fsmoneytracker.cpp @@ -22,15 +22,11 @@ */ #include "llviewerprecompiledheaders.h" +#include "fschathistory.h" #include "fsmoneytracker.h" -#include "llfloaterreg.h" #include "llviewercontrol.h" -#include "lllineeditor.h" -#include "llnotificationmanager.h" #include "lltrans.h" - - FSMoneyTracker::FSMoneyTracker(const LLSD& seed) : LLFloater(seed) { @@ -44,10 +40,7 @@ FSMoneyTracker::~FSMoneyTracker() BOOL FSMoneyTracker::postBuild() { - // [FS communication UI] - //mTransactionHistory = getChild("money_chat_history"); mTransactionHistory = getChild("money_chat_history"); - // [FS communication UI] mTransactionHistory->clear(); // Button Actions diff --git a/indra/newview/fsmoneytracker.h b/indra/newview/fsmoneytracker.h index 6ebff51962..be6173fd99 100644 --- a/indra/newview/fsmoneytracker.h +++ b/indra/newview/fsmoneytracker.h @@ -25,15 +25,9 @@ #define FS_MONEYTRACKER_H #include "llfloater.h" -#include "llsingleton.h" -// [FS communication UI] -//#include "llchathistory.h" -#include "fschathistory.h" -// [FS communication UI] -#include "lllineeditor.h" -#include "llchat.h" -#include +class FSChatHistory; +class LLChat; class LLTextBox; class LLViewerRegion; @@ -49,10 +43,7 @@ public: private: void clear(); std::string appendTime(); - // [FS communication UI] - //LLChatHistory* mTransactionHistory; FSChatHistory* mTransactionHistory; - // [FS communication UI] }; #endif // FS_MONEYTRACKER_H diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp index 01129cb034..b396dc49dc 100644 --- a/indra/newview/fsradar.cpp +++ b/indra/newview/fsradar.cpp @@ -38,6 +38,7 @@ // newview #include "fscommon.h" #include "fslslbridge.h" +#include "fslslbridgerequest.h" #include "fswsassetblacklist.h" #include "lggcontactsets.h" #include "lfsimfeaturehandler.h"