From 5164aa405696d01879a040db90103e1660d4b59f Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 25 Apr 2017 18:21:09 -0700 Subject: [PATCH] hacking --- interface/src/Application.cpp | 1 + libraries/avatars/src/AvatarData.cpp | 3 +++ libraries/avatars/src/AvatarData.h | 11 ++++------- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index dfe563b65a..0b8e37c21f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5209,6 +5209,7 @@ void Application::nodeAdded(SharedNodePointer node) const { // new avatar mixer, send off our identity packet right away qDebug() << __FUNCTION__ << "about to call... getMyAvatar()->sendIdentityPacket();"; + getMyAvatar()->markIdentityDataChanged(); getMyAvatar()->sendIdentityPacket(); getMyAvatar()->resetLastSent(); } diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 532e762e0e..af43b16861 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -1489,6 +1489,9 @@ void AvatarData::processAvatarIdentity(const Identity& identity, bool& identityC return; } + qCDebug(avatars) << __FUNCTION__ << "got identity packet for avatar " << getSessionUUID() + << "identity.updatedAt:" << identity.updatedAt << "_identityUpdatedAt:" << _identityUpdatedAt; + if (_firstSkeletonCheck || (identity.skeletonModelURL != cannonicalSkeletonModelURL(emptyURL))) { setSkeletonModelURL(identity.skeletonModelURL); identityChanged = true; diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index b4d3839d8a..7b24ae6cd7 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -624,7 +624,10 @@ public: static float _avatarSortCoefficientAge; bool getIdentityDataChanged() const { return _identityDataChanged; } // has the identity data changed since the last time sendIdentityPacket() was called - + void markIdentityDataChanged() { + _identityDataChanged = true; + _identityUpdatedAt = usecTimestampNow(); + } signals: void displayNameChanged(); @@ -786,12 +789,6 @@ protected: bool _identityDataChanged { false }; quint64 _identityUpdatedAt { 0 }; - void markIdentityDataChanged() { - _identityDataChanged = true; - _identityUpdatedAt = usecTimestampNow(); - } - - private: friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar); static QUrl _defaultFullAvatarModelUrl;