summaryrefslogtreecommitdiff
path: root/indra/newview/llcallingcard.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
-rw-r--r--indra/newview/llcallingcard.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index f5bc2343fb..039164cd6e 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -26,16 +26,11 @@
#include "llviewerprecompiledheaders.h"
-#if LL_WINDOWS
-#pragma warning( disable : 4800 ) // performance warning in <functional>
-#endif
-
#include "llcallingcard.h"
#include <algorithm>
#include "indra_constants.h"
-//#include "llcachename.h"
#include "llstl.h"
#include "lltimer.h"
#include "lluuid.h"
@@ -99,7 +94,7 @@ LLAvatarTracker::LLAvatarTracker() :
mTrackingData(NULL),
mTrackedAgentValid(false),
mModifyMask(0x0),
- mIsNotifyObservers(FALSE)
+ mIsNotifyObservers(false)
{
}
@@ -497,7 +492,7 @@ void LLAvatarTracker::notifyObservers()
return;
}
LL_PROFILE_ZONE_SCOPED
- mIsNotifyObservers = TRUE;
+ mIsNotifyObservers = true;
observer_list_t observers(mObservers);
observer_list_t::iterator it = observers.begin();
@@ -514,7 +509,7 @@ void LLAvatarTracker::notifyObservers()
mModifyMask = LLFriendObserver::NONE;
mChangedBuddyIDs.clear();
- mIsNotifyObservers = FALSE;
+ mIsNotifyObservers = false;
}
void LLAvatarTracker::addParticularFriendObserver(const LLUUID& buddy_id, LLFriendObserver* observer)
@@ -685,7 +680,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
{
LL_PROFILE_ZONE_SCOPED
S32 count = msg->getNumberOfBlocksFast(_PREHASH_AgentBlock);
- BOOL chat_notify = gSavedSettings.getBOOL("ChatOnlineNotification");
+ bool chat_notify = gSavedSettings.getBOOL("ChatOnlineNotification");
LL_DEBUGS() << "Received " << count << " online notifications **** " << LL_ENDL;
if(count > 0)
@@ -749,7 +744,7 @@ static void on_avatar_name_cache_notify(const LLUUID& agent_id,
notification =
LLNotifications::instance().add("FriendOnlineOffline",
args,
- payload.with("respond_on_mousedown", TRUE),
+ payload.with("respond_on_mousedown", true),
boost::bind(&LLAvatarActions::startIM, agent_id));
}
else