From df0b2f4eec11f7d02d2d8f382bb76dd64a180b7c Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 20 Sep 2013 13:28:50 -0700 Subject: [PATCH] Fix for face model sending. --- interface/src/avatar/Avatar.cpp | 2 +- interface/src/avatar/BlendFace.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index a5ed16bcb5..3f64436ff3 100755 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -76,7 +76,7 @@ void Avatar::sendAvatarURLsMessage(const QUrl& voxelURL, const QUrl& faceURL) { message.append(packetHeader, numBytesPacketHeader); message.append((const char*)&ownerID, sizeof(ownerID)); - QDataStream out(&message, QIODevice::WriteOnly); + QDataStream out(&message, QIODevice::WriteOnly | QIODevice::Append); out << voxelURL; out << faceURL; diff --git a/interface/src/avatar/BlendFace.cpp b/interface/src/avatar/BlendFace.cpp index 0fdd37da2c..e8e6e1d4e7 100644 --- a/interface/src/avatar/BlendFace.cpp +++ b/interface/src/avatar/BlendFace.cpp @@ -20,6 +20,8 @@ BlendFace::BlendFace(Head* owningHead) : _modelReply(NULL), _iboID(0) { + // we may have been created in the network thread, but we live in the main thread + moveToThread(Application::getInstance()->thread()); } BlendFace::~BlendFace() {