From 743d1a58e2c4d07fa26f61b1512190263225fa42 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Tue, 5 Mar 2019 09:34:29 -0800 Subject: [PATCH] Style tweaks from review --- assignment-client/src/avatars/AvatarMixerSlave.cpp | 6 ------ assignment-client/src/avatars/MixerAvatar.h | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp index b52bf03471..e59c81f4b7 100644 --- a/assignment-client/src/avatars/AvatarMixerSlave.cpp +++ b/assignment-client/src/avatars/AvatarMixerSlave.cpp @@ -355,9 +355,6 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node) // about avatars they've ignored or that are out of view bool PALIsOpen = destinationNodeData->getRequestsDomainListData(); bool PALWasOpen = destinationNodeData->getPrevRequestsDomainListData(); - if (PALIsOpen) { - qCWarning(avatars) << "PAL is open:" << avatar.getSessionDisplayName(); - } // When this is true, the AvatarMixer will send Avatar data to a client about avatars that have ignored them bool getsAnyIgnored = PALIsOpen && destinationNode->getCanKick(); @@ -526,9 +523,6 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node) _stats.overBudgetAvatars++; detail = AvatarData::PALMinimum; } else { - if (currentVariant == kHero) { - qCWarning(avatars) << "Overbudget break with hero avatars!" << destinationNode->getUUID().toString(); - } _stats.overBudgetAvatars += remainingAvatars; break; } diff --git a/assignment-client/src/avatars/MixerAvatar.h b/assignment-client/src/avatars/MixerAvatar.h index 2444bd541c..4c3ded4582 100644 --- a/assignment-client/src/avatars/MixerAvatar.h +++ b/assignment-client/src/avatars/MixerAvatar.h @@ -19,11 +19,11 @@ class MixerAvatar : public AvatarData { public: - bool getHasPriority() const { return _bHasPriority; } - void setHasPriority(bool bPriorityAvatar) { _bHasPriority = bPriorityAvatar; } + bool getHasPriority() const { return _hasPriority; } + void setHasPriority(bool hasPriority) { _hasPriority = hasPriority; } private: - bool _bHasPriority { false }; + bool _hasPriority { false }; }; using MixerAvatarSharedPointer = std::shared_ptr;