Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 01:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidying

Browse source
This commit is contained in:
David Rowe 2021-03-16 14:37:16 +13:00
parent 55dcf6534c
commit 2030d24523
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/avatars/AvatarMixerClientData.cpp
View file

@ -297,7 +297,7 @@ void AvatarMixerClientData::processSetTraitsMessage(ReceivedMessage& message,
} }
} }
void AvatarMixerClientData::emulateDeleteEntitiesTraitsMessage(QList<QUuid>& avatarEntityIDs) { void AvatarMixerClientData::emulateDeleteEntitiesTraitsMessage(const QList<QUuid>& avatarEntityIDs) {
// Emulates processSetTraitsMessage() actions on behalf of an avatar whose canRezAvatarEntities permission has been removed. // 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. // The source avatar should be removing its avatar entities. However, this provides a back-up.

2
assignment-client/src/avatars/AvatarMixerClientData.h
View file

@ -132,7 +132,7 @@ public:
int processPackets(const SlaveSharedData& slaveSharedData); // returns number of packets processed int processPackets(const SlaveSharedData& slaveSharedData); // returns number of packets processed
void processSetTraitsMessage(ReceivedMessage& message, const SlaveSharedData& slaveSharedData, Node& sendingNode); void processSetTraitsMessage(ReceivedMessage& message, const SlaveSharedData& slaveSharedData, Node& sendingNode);
void emulateDeleteEntitiesTraitsMessage(QList<QUuid>& avatarEntityIDs); void emulateDeleteEntitiesTraitsMessage(const QList<QUuid>& avatarEntityIDs);
void processBulkAvatarTraitsAckMessage(ReceivedMessage& message); void processBulkAvatarTraitsAckMessage(ReceivedMessage& message);
void checkSkeletonURLAgainstWhitelist(const SlaveSharedData& slaveSharedData, Node& sendingNode, void checkSkeletonURLAgainstWhitelist(const SlaveSharedData& slaveSharedData, Node& sendingNode,
AvatarTraits::TraitVersion traitVersion); AvatarTraits::TraitVersion traitVersion);

2
interface/src/avatar/MyAvatar.cpp
View file

@ -1588,7 +1588,7 @@ void MyAvatar::addAvatarEntitiesToTree() {
} }
} }
bool MyAvatar::hasAvatarEntities() { bool MyAvatar::hasAvatarEntities() const {
return _cachedAvatarEntityBlobs.count() > 0; return _cachedAvatarEntityBlobs.count() > 0;
} }

2
interface/src/avatar/MyAvatar.h
View file

@ -1454,7 +1454,7 @@ public:
void removeWornAvatarEntity(const EntityItemID& entityID); void removeWornAvatarEntity(const EntityItemID& entityID);
void clearWornAvatarEntities(); void clearWornAvatarEntities();
bool hasAvatarEntities(); bool hasAvatarEntities() const;
/**jsdoc /**jsdoc
* Checks whether your avatar is flying. * Checks whether your avatar is flying.

2
libraries/networking/src/NodeList.cpp
View file

@ -833,7 +833,7 @@ void NodeList::processDomainServerList(QSharedPointer<ReceivedMessage> message)
// Don't continue login to the domain if have avatar entities and don't have permissions to rez them, unless user has OKed // 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. // continuing login.
if (!newPermissions.can(NodePermissions::Permission::canRezAvatarEntities) if (!newPermissions.can(NodePermissions::Permission::canRezAvatarEntities)
&& (!adjustedPermissions || !_domainHandler.canConnectWithoutAvatarEntities())) { && (!adjustedPermissions || !_domainHandler.canConnectWithoutAvatarEntities())) {
return; return;
} }