From e119c387485be52b581e438bd348c12edcab586c Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 28 Mar 2017 09:26:40 -0700
Subject: [PATCH 1/2] bad serialization of parentID
---
libraries/entities/src/EntityEditPacketSender.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index 00f85f5078..8ea9f0c595 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
@@ -60,8 +60,10 @@ void EntityEditPacketSender::queueEditAvatarEntityMessage(PacketType type,
// the ID of the parent/avatar changes from session to session. use a special UUID to indicate the avatar
QJsonObject jsonObject = jsonProperties.object();
- if (QUuid(jsonObject["parentID"].toString()) == _myAvatar->getID()) {
- jsonObject["parentID"] = AVATAR_SELF_ID.toString();
+ if(jsonObject.contains("parentID")) {
+ if (QUuid(jsonObject["parentID"].toString()) == _myAvatar->getID()) {
+ jsonObject["parentID"] = AVATAR_SELF_ID.toString();
+ }
}
jsonProperties = QJsonDocument(jsonObject);
From 4b40633104ff76e09bf7d4c1abd81b4765da62e0 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 28 Mar 2017 11:22:18 -0700
Subject: [PATCH 2/2] oops damn space
---
libraries/entities/src/EntityEditPacketSender.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index 8ea9f0c595..7845b0d5e3 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
@@ -60,7 +60,7 @@ void EntityEditPacketSender::queueEditAvatarEntityMessage(PacketType type,
// the ID of the parent/avatar changes from session to session. use a special UUID to indicate the avatar
QJsonObject jsonObject = jsonProperties.object();
- if(jsonObject.contains("parentID")) {
+ if (jsonObject.contains("parentID")) {
if (QUuid(jsonObject["parentID"].toString()) == _myAvatar->getID()) {
jsonObject["parentID"] = AVATAR_SELF_ID.toString();
}