livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize this...

Ansariel 2014-07-10 15:13:30 +02:00
parent 24865f5809
commit 39727765a3
21 changed files with 37 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/dialogstack.h
View File

@ -27,8 +27,6 @@
#include "llsingleton.h"
#include <list>
class DialogStack
: public LLSingleton<DialogStack>
{

2
indra/newview/fsareasearch.h
View File

@ -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"

3
indra/newview/fsconsoleutils.cpp
View File

@ -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()

4
indra/newview/fsconsoleutils.h
View File

@ -28,8 +28,8 @@
#ifndef FS_CONSOLEUTILS_H
#define FS_CONSOLEUTILS_H
#include "llavatarnamecache.h"
#include "llviewerchat.h"
class LLAvatarName;
class LLChat;
class FSConsoleUtils
{

1
indra/newview/fsdata.cpp
View File

@ -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"

3
indra/newview/fsdata.h
View File

@ -28,10 +28,7 @@
#ifndef FS_DATA_H
#define FS_DATA_H
#include <map>
#include "llinstantmessage.h"
#include "llsd.h"
#include "llsingleton.h"
class FSData : public LLSingleton<FSData>

1
indra/newview/fsfloaterblocklist.cpp
View File

@ -28,7 +28,6 @@
#include "llviewerprecompiledheaders.h"
#include "fsfloaterblocklist.h"
#include "llviewercontrol.h"
FSFloaterBlocklist::FSFloaterBlocklist(const LLSD& seed)
: LLFloater(seed),

2
indra/newview/fsfloaterblocklist.h
View File

@ -30,8 +30,6 @@
#include "llfloater.h"
#include "llpanelblockedlist.h"
class FSFloaterBlocklist : public LLFloater
{
public:

2
indra/newview/fsfloatercontacts.cpp
View File

@ -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"

2
indra/newview/fsfloatercontacts.h
View File

@ -30,8 +30,6 @@
#define FS_FLOATERCONTACTS_H
#include "llfloater.h"
#include "lleventtimer.h"
#include "llcallingcard.h"
class LLAvatarList;
class LLAvatarName;

1
indra/newview/fsfloatergroup.cpp
View File

@ -30,6 +30,7 @@
#include "fsfloatergroup.h"
#include "llfloaterreg.h"
#include "llpanelgroup.h"
FSFloaterGroup::FSFloaterGroup(const LLSD& seed)
: LLFloater(seed),

1
indra/newview/fsfloatergroup.h
View File

@ -29,7 +29,6 @@
#define FS_FLOATERGROUP_H
#include "llfloater.h"
#include "llpanelgroup.h"
class LLPanelGroup;

3
indra/newview/fsfloatergrouptitles.cpp
View File

@ -28,8 +28,7 @@
#include "fsfloatergrouptitles.h"
#include "llgroupactions.h"
#include "llscrolllistitem.h"
#include "llviewermessage.h"
#include "llscrolllistctrl.h"
#include "lltrans.h"
/////////////////////////////////////////////////////

2
indra/newview/fsfloatergrouptitles.h
View File

@ -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
{

8
indra/newview/fsfloaterwsassetblacklist.cpp
View File

@ -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<LLScrollListCtrl>("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();
}

14
indra/newview/fsfloaterwsassetblacklist.h
View File

@ -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;

45
indra/newview/fslslbridge.cpp
View File

@ -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 <boost/regex.hpp>
#include <string>
#include <fstream>
#include <streambuf>
#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 <boost/regex.hpp>
#if OPENSIM
#include "llviewernetwork.h"

6
indra/newview/fslslbridge.h
View File

@ -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

9
indra/newview/fsmoneytracker.cpp
View File

@ -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:Ansariel> [FS communication UI]
//mTransactionHistory = getChild<LLChatHistory>("money_chat_history");
mTransactionHistory = getChild<FSChatHistory>("money_chat_history");
// </FS:Ansariel> [FS communication UI]
mTransactionHistory->clear();
// Button Actions

13
indra/newview/fsmoneytracker.h
View File

@ -25,15 +25,9 @@
#define FS_MONEYTRACKER_H
#include "llfloater.h"
#include "llsingleton.h"
// <FS:Ansariel> [FS communication UI]
//#include "llchathistory.h"
#include "fschathistory.h"
// </FS:Ansariel> [FS communication UI]
#include "lllineeditor.h"
#include "llchat.h"
#include <string.h>
class FSChatHistory;
class LLChat;
class LLTextBox;
class LLViewerRegion;
@ -49,10 +43,7 @@ public:
private:
void clear();
std::string appendTime();
// <FS:Ansariel> [FS communication UI]
//LLChatHistory* mTransactionHistory;
FSChatHistory* mTransactionHistory;
// </FS:Ansariel> [FS communication UI]
};
#endif // FS_MONEYTRACKER_H

1
indra/newview/fsradar.cpp
View File

@ -38,6 +38,7 @@
// newview
#include "fscommon.h"
#include "fslslbridge.h"
#include "fslslbridgerequest.h"
#include "fswsassetblacklist.h"
#include "lggcontactsets.h"
#include "lfsimfeaturehandler.h"