From 83d14d33809a0702d50b938a9d1ab8e496eb6291 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Wed, 9 Sep 2015 11:11:06 -0700 Subject: [PATCH] Protect avatarLock. --- libraries/avatars/src/AvatarData.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 1809704ce5..81d252c622 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -324,8 +324,6 @@ public: bool shouldDie() const { return _owningAvatarMixer.isNull() || getUsecsSinceLastUpdate() > AVATAR_SILENCE_THRESHOLD_USECS; } - QMutex avatarLock; // Name is redundant, but it aids searches. - public slots: void sendAvatarDataPacket(); void sendIdentityPacket(); @@ -424,6 +422,8 @@ protected: SimpleMovingAverage _averageBytesReceived; + QMutex avatarLock; // Name is redundant, but it aids searches. + private: static QUrl _defaultFullAvatarModelUrl; // privatize the copy constructor and assignment operator so they cannot be called