From 2030d2452360c1ae3a5055587871e1edc88d09c4 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 16 Mar 2021 14:37:16 +1300 Subject: [PATCH] Tidying --- assignment-client/src/avatars/AvatarMixerClientData.cpp | 2 +- assignment-client/src/avatars/AvatarMixerClientData.h | 2 +- interface/src/avatar/MyAvatar.cpp | 2 +- interface/src/avatar/MyAvatar.h | 2 +- libraries/networking/src/NodeList.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp index fe83f93cd3..ac4ad11ecc 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.cpp +++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp @@ -297,7 +297,7 @@ void AvatarMixerClientData::processSetTraitsMessage(ReceivedMessage& message, } } -void AvatarMixerClientData::emulateDeleteEntitiesTraitsMessage(QList& avatarEntityIDs) { +void AvatarMixerClientData::emulateDeleteEntitiesTraitsMessage(const QList& avatarEntityIDs) { // Emulates processSetTraitsMessage() actions on behalf of an avatar whose canRezAvatarEntities permission has been removed. // The source avatar should be removing its avatar entities. However, this provides a back-up. diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h index 1e2e4518d4..83a2ff384a 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.h +++ b/assignment-client/src/avatars/AvatarMixerClientData.h @@ -132,7 +132,7 @@ public: int processPackets(const SlaveSharedData& slaveSharedData); // returns number of packets processed void processSetTraitsMessage(ReceivedMessage& message, const SlaveSharedData& slaveSharedData, Node& sendingNode); - void emulateDeleteEntitiesTraitsMessage(QList& avatarEntityIDs); + void emulateDeleteEntitiesTraitsMessage(const QList& avatarEntityIDs); void processBulkAvatarTraitsAckMessage(ReceivedMessage& message); void checkSkeletonURLAgainstWhitelist(const SlaveSharedData& slaveSharedData, Node& sendingNode, AvatarTraits::TraitVersion traitVersion); diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 71c54e1202..46f2ad3be8 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1588,7 +1588,7 @@ void MyAvatar::addAvatarEntitiesToTree() { } } -bool MyAvatar::hasAvatarEntities() { +bool MyAvatar::hasAvatarEntities() const { return _cachedAvatarEntityBlobs.count() > 0; } diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 1c1aea293a..ca5ed3b73c 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -1454,7 +1454,7 @@ public: void removeWornAvatarEntity(const EntityItemID& entityID); void clearWornAvatarEntities(); - bool hasAvatarEntities(); + bool hasAvatarEntities() const; /**jsdoc * Checks whether your avatar is flying. diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 344f5a8228..05e71d0225 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -833,7 +833,7 @@ void NodeList::processDomainServerList(QSharedPointer message) // Don't continue login to the domain if have avatar entities and don't have permissions to rez them, unless user has OKed // continuing login. if (!newPermissions.can(NodePermissions::Permission::canRezAvatarEntities) - && (!adjustedPermissions || !_domainHandler.canConnectWithoutAvatarEntities())) { + && (!adjustedPermissions || !_domainHandler.canConnectWithoutAvatarEntities())) { return; }