Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #967 from ey6es/blendface

Browse source 
Fix for face model sending.
This commit is contained in:
Andrzej Kapolka 2013-09-20 13:29:57 -07:00
commit 873b56e39f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/Avatar.cpp
View file

@ -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;

2
interface/src/avatar/BlendFace.cpp
View file

@ -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() {