From ca1ff9b0f5a87a50e1802035380a286f7538fcf6 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 13 Jul 2015 13:34:36 -0700 Subject: [PATCH] fix a couple of compile errors for avatar changes --- interface/src/avatar/AvatarManager.cpp | 4 ---- interface/src/avatar/AvatarManager.h | 2 -- interface/src/avatar/MyAvatar.cpp | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index 47d7ff06c5..944f16fd34 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -56,10 +56,6 @@ static void localLightFromScriptValue(const QScriptValue& value, AvatarManager:: vec3FromScriptValue(value.property("color"), light.color); } -AvatarManager::AvatarManager() { - -} - void AvatarManager::registerMetaTypes(QScriptEngine* engine) { qScriptRegisterMetaType(engine, localLightToScriptValue, localLightFromScriptValue); qScriptRegisterSequenceMetaType >(engine); diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h index dad3f488cf..5e3fe9543a 100644 --- a/interface/src/avatar/AvatarManager.h +++ b/interface/src/avatar/AvatarManager.h @@ -29,8 +29,6 @@ class AvatarManager : public AvatarHashMap { SINGLETON_DEPENDENCY public: - AvatarManager(); - /// Registers the script types associated with the avatar manager. static void registerMetaTypes(QScriptEngine* engine); diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index ef93485a38..bb6188f52c 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -872,7 +872,7 @@ AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString& int MyAvatar::parseDataFromBuffer(const QByteArray& buffer) { qCDebug(interfaceapp) << "Error: ignoring update packet for MyAvatar" - << " packetLength = " << buffer.size() + << " packetLength = " << buffer.size(); // this packet is just bad, so we pretend that we unpacked it ALL return buffer.size(); }