diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml index 72f92f4d2d..e50f43674e 100644 --- a/interface/resources/qml/Stats.qml +++ b/interface/resources/qml/Stats.qml @@ -115,7 +115,7 @@ Item { color: root.fontColor font.pixelSize: root.fontSize visible: root.expanded; - text: "Voxel max ping: " + 0 + text: "Messages max ping: " + root.messagePing } } } diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp index daf6d39cc3..c711560b53 100644 --- a/interface/src/ui/Stats.cpp +++ b/interface/src/ui/Stats.cpp @@ -136,10 +136,12 @@ void Stats::updateStats(bool force) { SharedNodePointer audioMixerNode = nodeList->soloNodeOfType(NodeType::AudioMixer); SharedNodePointer avatarMixerNode = nodeList->soloNodeOfType(NodeType::AvatarMixer); SharedNodePointer assetServerNode = nodeList->soloNodeOfType(NodeType::AssetServer); + SharedNodePointer messageMixerNode = nodeList->soloNodeOfType(NodeType::MessagesMixer); STAT_UPDATE(audioPing, audioMixerNode ? audioMixerNode->getPingMs() : -1); STAT_UPDATE(avatarPing, avatarMixerNode ? avatarMixerNode->getPingMs() : -1); STAT_UPDATE(assetPing, assetServerNode ? assetServerNode->getPingMs() : -1); - + STAT_UPDATE(messagePing, messageMixerNode ? messageMixerNode->getPingMs() : -1); + //// Now handle entity servers, since there could be more than one, we average their ping times int totalPingOctree = 0; int octreeServerCount = 0; diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h index 3476087852..ebcb80c404 100644 --- a/interface/src/ui/Stats.h +++ b/interface/src/ui/Stats.h @@ -45,7 +45,8 @@ class Stats : public QQuickItem { STATS_PROPERTY(int, avatarPing, 0) STATS_PROPERTY(int, entitiesPing, 0) STATS_PROPERTY(int, assetPing, 0) - STATS_PROPERTY(QVector3D, position, QVector3D(0, 0, 0) ) + STATS_PROPERTY(int, messagePing, 0) + STATS_PROPERTY(QVector3D, position, QVector3D(0, 0, 0)) STATS_PROPERTY(float, speed, 0) STATS_PROPERTY(float, yaw, 0) STATS_PROPERTY(int, avatarMixerInKbps, 0) @@ -123,6 +124,7 @@ signals: void avatarPingChanged(); void entitiesPingChanged(); void assetPingChanged(); + void messagePingChanged(); void positionChanged(); void speedChanged(); void yawChanged(); diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h index b1d8a31254..8190f7225b 100644 --- a/libraries/entities/src/EntityTree.h +++ b/libraries/entities/src/EntityTree.h @@ -114,8 +114,8 @@ public: // use this method if you have a pointer to the entity (avoid an extra entity lookup) bool updateEntity(EntityItemPointer entity, const EntityItemProperties& properties, const SharedNodePointer& senderNode = SharedNodePointer(nullptr)); - void deleteEntity(const EntityItemID& entityID, bool force = false, bool ignoreWarnings = false); - void deleteEntities(QSet entityIDs, bool force = false, bool ignoreWarnings = false); + void deleteEntity(const EntityItemID& entityID, bool force = false, bool ignoreWarnings = true); + void deleteEntities(QSet entityIDs, bool force = false, bool ignoreWarnings = true); /// \param position point of query in world-frame (meters) /// \param targetRadius radius of query (meters)