From b6620f128bfdafc1f10ec5a0730ecfee727efd46 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 11 Aug 2016 11:06:36 -0700
Subject: [PATCH] Add asset server bandwidth to stats

---
 interface/resources/qml/Stats.qml | 6 ++++++
 interface/src/ui/Stats.cpp        | 3 +++
 interface/src/ui/Stats.h          | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/interface/resources/qml/Stats.qml b/interface/resources/qml/Stats.qml
index fe88899658..180e5e1bcc 100644
--- a/interface/resources/qml/Stats.qml
+++ b/interface/resources/qml/Stats.qml
@@ -99,6 +99,12 @@ Item {
                         font.pixelSize: root.fontSize
                         text: "Mbps In/Out: " + root.mbpsIn.toFixed(2) + "/" + root.mbpsOut.toFixed(2)
                     }
+                    Text {
+                        color: root.fontColor;
+                        font.pixelSize: root.fontSize
+                        visible: root.expanded
+                        text: "Asset Mbps In/Out: " + root.assetMbpsIn.toFixed(2) + "/" + root.assetMbpsOut.toFixed(2)
+                    }
                 }
             }
 
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index ec4b2280b6..7fdf5cd57d 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -136,6 +136,9 @@ void Stats::updateStats(bool force) {
     STAT_UPDATE_FLOAT(mbpsIn, (float)bandwidthRecorder->getCachedTotalAverageInputKilobitsPerSecond() / 1000.0f, 0.01f);
     STAT_UPDATE_FLOAT(mbpsOut, (float)bandwidthRecorder->getCachedTotalAverageOutputKilobitsPerSecond() / 1000.0f, 0.01f);
 
+    STAT_UPDATE_FLOAT(assetMbpsIn, (float)bandwidthRecorder->getAverageInputKilobitsPerSecond(NodeType::AssetServer) / 1000.0f, 0.01f);
+    STAT_UPDATE_FLOAT(assetMbpsOut, (float)bandwidthRecorder->getAverageOutputKilobitsPerSecond(NodeType::AssetServer) / 1000.0f, 0.01f);
+
     // Second column: ping
     SharedNodePointer audioMixerNode = nodeList->soloNodeOfType(NodeType::AudioMixer);
     SharedNodePointer avatarMixerNode = nodeList->soloNodeOfType(NodeType::AvatarMixer);
diff --git a/interface/src/ui/Stats.h b/interface/src/ui/Stats.h
index f6643a1a7a..4be2d88d9e 100644
--- a/interface/src/ui/Stats.h
+++ b/interface/src/ui/Stats.h
@@ -43,6 +43,8 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(int, packetOutCount, 0)
     STATS_PROPERTY(float, mbpsIn, 0)
     STATS_PROPERTY(float, mbpsOut, 0)
+    STATS_PROPERTY(float, assetMbpsIn, 0)
+    STATS_PROPERTY(float, assetMbpsOut, 0)
     STATS_PROPERTY(int, audioPing, 0)
     STATS_PROPERTY(int, avatarPing, 0)
     STATS_PROPERTY(int, entitiesPing, 0)
@@ -128,6 +130,8 @@ signals:
     void packetOutCountChanged();
     void mbpsInChanged();
     void mbpsOutChanged();
+    void assetMbpsInChanged();
+    void assetMbpsOutChanged();
     void audioPingChanged();
     void avatarPingChanged();
     void entitiesPingChanged();