Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 06:29:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add log; fix whitespace

Browse source
This commit is contained in:
Zach Fox 2017-01-17 11:51:09 -08:00
parent 1e8effdcc4
commit 246f5fb7f5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -280,12 +280,14 @@ void AvatarMixer::broadcastAvatarData() {
QPair<int, int>& soFar = _sessionDisplayNames[baseName]; // Inserts and answers 0, 0 if not already present, which is what we want. QPair<int, int>& soFar = _sessionDisplayNames[baseName]; // Inserts and answers 0, 0 if not already present, which is what we want.
int& highWater = soFar.first; int& highWater = soFar.first;
nodeData->setBaseDisplayName(baseName); nodeData->setBaseDisplayName(baseName);
avatar.setSessionDisplayName((highWater > 0) ? baseName + "_" + QString::number(highWater) : baseName); QString sessionDisplayName = (highWater > 0) ? baseName + "_" + QString::number(highWater) : baseName;
avatar.setSessionDisplayName(sessionDisplayName);
highWater++; highWater++;
soFar.second++; // refcount soFar.second++; // refcount
nodeData->flagIdentityChange(); nodeData->flagIdentityChange();
nodeData->setAvatarSessionDisplayNameMustChange(false); nodeData->setAvatarSessionDisplayNameMustChange(false);
sendIdentityPacket(nodeData, node); // Tell node whose name changed about its new session display name. Others will find out below. sendIdentityPacket(nodeData, node); // Tell node whose name changed about its new session display name. Others will find out below.
qDebug() << "Giving session display name" << sessionDisplayName << "to node with ID" << node->getUUID();
} }
// this is an AGENT we have received head data from // this is an AGENT we have received head data from

2
libraries/networking/src/udt/PacketHeaders.h
View file

@ -212,7 +212,7 @@ enum class AvatarMixerPacketVersion : PacketVersion {
HasKillAvatarReason, HasKillAvatarReason,
SessionDisplayName, SessionDisplayName,
Unignore, Unignore,
ImmediateSessionDisplayNameUpdates ImmediateSessionDisplayNameUpdates
}; };
enum class DomainConnectRequestVersion : PacketVersion { enum class DomainConnectRequestVersion : PacketVersion {