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

Clean up includes in FSFloaterIMContainer

master
Ansariel 2015-09-04 20:34:30 +02:00
parent 213f3f00ec
commit 9b72178ca9
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/fsfloaterimcontainer.cpp
View File

@ -30,21 +30,15 @@
#include "llviewerprecompiledheaders.h"
#include "fsfloaterimcontainer.h"
#include "llfloaterreg.h"
#include "llimview.h"
#include "llavatariconctrl.h"
#include "llgroupiconctrl.h"
#include "llagent.h"
#include "lltransientfloatermgr.h"
#include "fsfloaternearbychat.h"
#include "fsfloatercontacts.h"
#include "llfloater.h"
#include "llviewercontrol.h"
#include "fsfloaterim.h"
#include "llvoiceclient.h"
#include "lltoolbarview.h"
#include "fsfloaternearbychat.h"
#include "llfloaterreg.h"
#include "llchiclet.h"
#include "llchicletbar.h"
#include "lltoolbarview.h"
#include "llvoiceclient.h"
static const F32 VOICE_STATUS_UPDATE_INTERVAL = 1.0f;
@ -340,8 +334,10 @@ void FSFloaterIMContainer::onNewMessageReceived(const LLSD& data)
if (floaterp && current_floater && floaterp != current_floater
&& (gSavedSettings.getBOOL("FSIMChatFlashOnFriendStatusChange") || !data.has("from_id") || data["from_id"].asUUID().notNull()))
{
if(LLMultiFloater::isFloaterFlashing(floaterp))
if (LLMultiFloater::isFloaterFlashing(floaterp))
{
LLMultiFloater::setFloaterFlashing(floaterp, FALSE);
}
LLMultiFloater::setFloaterFlashing(floaterp, TRUE);
}
}

8
indra/newview/fsfloaterimcontainer.h
View File

@ -30,13 +30,7 @@
#ifndef FS_FLOATERIMCONTAINER_H
#define FS_FLOATERIMCONTAINER_H
#include <map>
#include <vector>
#include "llfloater.h"
#include "llmultifloater.h"
#include "llavatarpropertiesprocessor.h"
#include "llgroupmgr.h"
#include "llimview.h"
class LLTabContainer;
@ -97,7 +91,7 @@ private:
eVoiceState mCurrentVoiceState;
bool mForceVoiceStateUpdate;
typedef std::map<LLUUID,LLFloater*> avatarID_panel_map_t;
typedef std::map<LLUUID, LLFloater*> avatarID_panel_map_t;
avatarID_panel_map_t mSessions;
boost::signals2::connection mNewMessageConnection;