diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llcallingcard.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
| -rw-r--r-- | indra/newview/llcallingcard.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index df79043b00..9396be0a4e 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -99,7 +99,7 @@ LLAvatarTracker::LLAvatarTracker() : mTrackingData(NULL), mTrackedAgentValid(false), mModifyMask(0x0), - mIsNotifyObservers(FALSE) + mIsNotifyObservers(false) { } @@ -497,7 +497,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 +514,7 @@ void LLAvatarTracker::notifyObservers() mModifyMask = LLFriendObserver::NONE; mChangedBuddyIDs.clear(); - mIsNotifyObservers = FALSE; + mIsNotifyObservers = false; } void LLAvatarTracker::addParticularFriendObserver(const LLUUID& buddy_id, LLFriendObserver* observer) @@ -685,7 +685,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 +749,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 |