Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 17:54:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10523 from birarda/bug/null-identity-packet-uuid

Browse source 
ensure AvatarMixerClientData AvatarData has session ID
This commit is contained in:
Brad Hefta-Gaub 2017-05-23 15:24:58 -07:00 committed by GitHub
commit e38381b0ef
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,14 @@
#include "AvatarMixerClientData.h"
AvatarMixerClientData::AvatarMixerClientData(const QUuid& nodeID) :
NodeData(nodeID)
{
_currentViewFrustum.invalidate();
// in case somebody calls getSessionUUID on the AvatarData instance, make sure it has the right ID
_avatar->setID(nodeID);
}
void AvatarMixerClientData::queuePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node) {
if (!_packetQueue.node) {

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

@ -36,7 +36,7 @@ const QString INBOUND_AVATAR_DATA_STATS_KEY = "inbound_av_data_kbps";
class AvatarMixerClientData : public NodeData {
Q_OBJECT
public:
AvatarMixerClientData(const QUuid& nodeID = QUuid()) : NodeData(nodeID) { _currentViewFrustum.invalidate(); }
AvatarMixerClientData(const QUuid& nodeID = QUuid());
virtual ~AvatarMixerClientData() {}
using HRCTime = p_high_resolution_clock::time_point;