From 432048addfafefc3e388911f52004ab6cad1c558 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 Jul 2015 11:55:50 -0700 Subject: [PATCH] use macro for AvatarMixer, show type for unknown --- assignment-client/src/avatars/AvatarMixer.h | 2 +- libraries/networking/src/LimitedNodeList.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.h b/assignment-client/src/avatars/AvatarMixer.h index 034269f7fa..67fdbf5285 100644 --- a/assignment-client/src/avatars/AvatarMixer.h +++ b/assignment-client/src/avatars/AvatarMixer.h @@ -19,6 +19,7 @@ /// Handles assignments of type AvatarMixer - distribution of avatar data to various clients class AvatarMixer : public ThreadedAssignment { + Q_OBJECT public: AvatarMixer(NLPacket& packet); ~AvatarMixer(); @@ -26,7 +27,6 @@ public slots: /// runs the avatar mixer void run(); - void nodeAdded(SharedNodePointer nodeAdded); void nodeKilled(SharedNodePointer killedNode); void sendStatsPacket(); diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 3bc4d0ff74..e752dcb682 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -206,8 +206,8 @@ bool LimitedNodeList::packetSourceAndHashMatch(const NLPacket& packet, SharedNod static QString repeatedMessage = LogHandler::getInstance().addRepeatedMessageRegex("Packet of type \\d+ received from unknown node with UUID"); - qCDebug(networking) << "Packet of type" << packet.getType() << "received from unknown node with UUID" - << qPrintable(uuidStringWithoutCurlyBraces(packet.getSourceID())); + qCDebug(networking) << "Packet of type" << packet.getType() << "(" << nameForPacketType(packet.getType()) << ")" + << "received from unknown node with UUID" << qPrintable(uuidStringWithoutCurlyBraces(packet.getSourceID())); } }