From 177445c371e32b5e65abfd9844c96b19fb77dfa4 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 10 Apr 2017 10:17:49 -0700 Subject: [PATCH] Does this work? --- libraries/avatars/src/AvatarHashMap.cpp | 8 ++++---- libraries/avatars/src/AvatarHashMap.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index 54c4cdc643..37139331aa 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -35,14 +35,14 @@ AvatarData* AvatarHashMap::getAvatar(QUuid avatarID) { return getAvatarBySessionID(avatarID).get(); } -QSharedPointer AvatarHashMap::getAvatarCopy(QUuid avatarID) { +AvatarData* AvatarHashMap::getAvatarCopy(QUuid avatarID) { AvatarData* avatarDataOriginal = getAvatarBySessionID(avatarID).get(); - QSharedPointer avatarDataCopy{ new AvatarData }; + AvatarData* avatarDataCopy { new AvatarData }; avatarDataCopy->setSessionUUID(avatarDataOriginal->getSessionUUID()); avatarDataCopy->setSessionDisplayName(avatarDataOriginal->getSessionDisplayName()); avatarDataCopy->setPosition(avatarDataOriginal->getPosition()); - //avatarDataCopy->setAudioLoudness(avatarDataOriginal->getAudioLoudness()); - //avatarDataCopy->setAudioAverageLoudness(avatarDataOriginal->getAudioAverageLoudness()); + avatarDataCopy->setAudioLoudness(avatarDataOriginal->getAudioLoudness()); + avatarDataCopy->setAudioAverageLoudness(avatarDataOriginal->getAudioAverageLoudness()); return avatarDataCopy; } diff --git a/libraries/avatars/src/AvatarHashMap.h b/libraries/avatars/src/AvatarHashMap.h index 6fe29865ea..bca6dec718 100644 --- a/libraries/avatars/src/AvatarHashMap.h +++ b/libraries/avatars/src/AvatarHashMap.h @@ -38,7 +38,7 @@ public: // Currently, your own avatar will be included as the null avatar id. Q_INVOKABLE QVector getAvatarIdentifiers(); Q_INVOKABLE AvatarData* getAvatar(QUuid avatarID); - Q_INVOKABLE QSharedPointer getAvatarCopy(QUuid avatarID); + Q_INVOKABLE AvatarData* getAvatarCopy(QUuid avatarID); virtual AvatarSharedPointer getAvatarBySessionID(const QUuid& sessionID) const { return findAvatar(sessionID); } int numberOfAvatarsInRange(const glm::vec3& position, float rangeMeters);