From 498d681d3e8d740cb8fb0d35d1ba3959ff93da56 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Fri, 7 Jun 2019 12:04:04 -0700
Subject: [PATCH 01/18] Force new IP port on local address change

---
 libraries/networking/src/LimitedNodeList.cpp | 8 ++++++--
 libraries/networking/src/udt/Socket.cpp      | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 0eda2ee2e0..97a12e4c71 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -1172,7 +1172,7 @@ void LimitedNodeList::stopInitialSTUNUpdate(bool success) {
 
     // We now setup a timer here to fire every so often to check that our IP address has not changed.
     // Or, if we failed - if will check if we can eventually get a public socket
-    const int STUN_IP_ADDRESS_CHECK_INTERVAL_MSECS = 30 * 1000;
+    const int STUN_IP_ADDRESS_CHECK_INTERVAL_MSECS = 10 * 1000;
 
     QTimer* stunOccasionalTimer = new QTimer { this };
     connect(stunOccasionalTimer, &QTimer::timeout, this, &LimitedNodeList::sendSTUNRequest);
@@ -1230,12 +1230,16 @@ void LimitedNodeList::errorTestingLocalSocket() {
 }
 
 void LimitedNodeList::setLocalSocket(const HifiSockAddr& sockAddr) {
-    if (sockAddr != _localSockAddr) {
+    if (sockAddr.getAddress() != _localSockAddr.getAddress()) {
 
         if (_localSockAddr.isNull()) {
             qCInfo(networking) << "Local socket is" << sockAddr;
         } else {
             qCInfo(networking) << "Local socket has changed from" << _localSockAddr << "to" << sockAddr;
+            if (_hasTCPCheckedLocalSocket) {  // Force a port change for NAT:
+                _nodeSocket.rebind(0);
+                _localSockAddr.setPort(_nodeSocket.localPort());
+            }
         }
 
         _localSockAddr = sockAddr;
diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index 98d6c0a6be..5a3111a7eb 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -73,6 +73,7 @@ void Socket::rebind() {
 
 void Socket::rebind(quint16 localPort) {
     _udpSocket.close();
+    _udpSocket.waitForDisconnected();
     bind(QHostAddress::AnyIPv4, localPort);
 }
 

From c088fab60602b9f5455f5d1e05208db2eff7c038 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Fri, 7 Jun 2019 16:23:38 -0700
Subject: [PATCH 02/18] Fix annoying typo

---
 libraries/networking/src/LimitedNodeList.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 97a12e4c71..d8d43f4b02 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -983,7 +983,7 @@ void LimitedNodeList::sendSTUNRequest() {
         const int NUM_INITIAL_STUN_REQUESTS_BEFORE_FAIL = 10;
 
         if (!_hasCompletedInitialSTUN) {
-            qCDebug(networking) << "Sending intial stun request to" << STUN_SERVER_HOSTNAME;
+            qCDebug(networking) << "Sending initial stun request to" << STUN_SERVER_HOSTNAME;
 
             if (_numInitialSTUNRequests > NUM_INITIAL_STUN_REQUESTS_BEFORE_FAIL) {
                 // we're still trying to do our initial STUN we're over the fail threshold

From d780964cb4979abfdf501dc72f16abe1106f6130 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Mon, 10 Jun 2019 17:28:49 -0700
Subject: [PATCH 03/18] Reset NodeList upon local nework change; abort current
 socket when rebinding

Also ensure QUdpSocket is owned by LimitedNodeList.
---
 libraries/networking/src/LimitedNodeList.cpp | 1 +
 libraries/networking/src/udt/Socket.cpp      | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 2f1a8c9d10..9b1f011680 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -1239,6 +1239,7 @@ void LimitedNodeList::setLocalSocket(const HifiSockAddr& sockAddr) {
         } else {
             qCInfo(networking) << "Local socket has changed from" << _localSockAddr << "to" << sockAddr;
             if (_hasTCPCheckedLocalSocket) {  // Force a port change for NAT:
+                reset();
                 _nodeSocket.rebind(0);
                 _localSockAddr.setPort(_nodeSocket.localPort());
             }
diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp
index 75d4c9ef45..bcc2293e1f 100644
--- a/libraries/networking/src/udt/Socket.cpp
+++ b/libraries/networking/src/udt/Socket.cpp
@@ -33,6 +33,7 @@ using namespace udt;
 
 Socket::Socket(QObject* parent, bool shouldChangeSocketOptions) :
     QObject(parent),
+    _udpSocket(parent),
     _readyReadBackupTimer(new QTimer(this)),
     _shouldChangeSocketOptions(shouldChangeSocketOptions)
 {
@@ -50,6 +51,7 @@ Socket::Socket(QObject* parent, bool shouldChangeSocketOptions) :
 }
 
 void Socket::bind(const QHostAddress& address, quint16 port) {
+
     _udpSocket.bind(address, port);
 
     if (_shouldChangeSocketOptions) {
@@ -72,8 +74,7 @@ void Socket::rebind() {
 }
 
 void Socket::rebind(quint16 localPort) {
-    _udpSocket.close();
-    _udpSocket.waitForDisconnected();
+    _udpSocket.abort();
     bind(QHostAddress::AnyIPv4, localPort);
 }
 

From cfcea359b2c5dc28630f952bf3794af687ee6faf Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Fri, 14 Jun 2019 16:51:59 -0700
Subject: [PATCH 04/18] Handle local address changes for servers

---
 domain-server/src/DomainServer.cpp           | 4 ++++
 libraries/networking/src/LimitedNodeList.cpp | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 44887599d3..00ca858a1f 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -739,6 +739,10 @@ void DomainServer::setupNodeListAndAssignments() {
 
     connect(nodeList.data(), &LimitedNodeList::nodeAdded, this, &DomainServer::nodeAdded);
     connect(nodeList.data(), &LimitedNodeList::nodeKilled, this, &DomainServer::nodeKilled);
+    connect(nodeList.data(), &LimitedNodeList::localSockAddrChanged, this,
+        [this](const HifiSockAddr& localSockAddr) {
+        DependencyManager::get<LimitedNodeList>()->putLocalPortIntoSharedMemory(DOMAIN_SERVER_LOCAL_PORT_SMEM_KEY, this, localSockAddr.getPort());
+    });
 
     // register as the packet receiver for the types we want
     PacketReceiver& packetReceiver = nodeList->getPacketReceiver();
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 92a5692ca9..e47b4cc7bc 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -1237,16 +1237,18 @@ void LimitedNodeList::setLocalSocket(const HifiSockAddr& sockAddr) {
 
         if (_localSockAddr.isNull()) {
             qCInfo(networking) << "Local socket is" << sockAddr;
+            _localSockAddr = sockAddr;
         } else {
             qCInfo(networking) << "Local socket has changed from" << _localSockAddr << "to" << sockAddr;
+            _localSockAddr = sockAddr;
             if (_hasTCPCheckedLocalSocket) {  // Force a port change for NAT:
                 reset();
                 _nodeSocket.rebind(0);
                 _localSockAddr.setPort(_nodeSocket.localPort());
+                qCInfo(networking) << "Local port changed to" << _localSockAddr.getPort();
             }
         }
 
-        _localSockAddr = sockAddr;
         emit localSockAddrChanged(_localSockAddr);
     }
 }

From 11b599f8f98639f38dd59aebf764fc2700abae5e Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Tue, 18 Jun 2019 09:34:55 -0700
Subject: [PATCH 05/18] Update SIMD resampler to avoid benign UBSan warnings
 due to unaligned load/store

---
 libraries/audio/src/AudioSRC.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/libraries/audio/src/AudioSRC.cpp b/libraries/audio/src/AudioSRC.cpp
index d488eccb6a..625f45e9ae 100644
--- a/libraries/audio/src/AudioSRC.cpp
+++ b/libraries/audio/src/AudioSRC.cpp
@@ -793,6 +793,18 @@ int AudioSRC::multirateFilter4(const float* input0, const float* input1, const f
 
 #include <emmintrin.h>  // SSE2
 
+// unaligned load/store without undefined behavior
+static inline __m128i mm_loadu_si32(void const* mem_addr) {
+    int32_t temp;
+    memcpy(&temp, mem_addr, sizeof(int32_t));
+    return _mm_cvtsi32_si128(temp);
+}
+
+static inline void mm_storeu_si32(void* mem_addr, __m128i a) {
+   int32_t temp = _mm_cvtsi128_si32(a);
+   memcpy(mem_addr, &temp, sizeof(int32_t));
+}
+
 // convert int16_t to float, deinterleave stereo
 void AudioSRC::convertInput(const int16_t* input, float** outputs, int numFrames) {
     __m128 scale = _mm_set1_ps(1/32768.0f);
@@ -839,7 +851,7 @@ void AudioSRC::convertInput(const int16_t* input, float** outputs, int numFrames
             _mm_storeu_ps(&outputs[1][i], f1);
         }
         for (; i < numFrames; i++) {
-            __m128i a0 = _mm_cvtsi32_si128(*(int32_t*)&input[2*i]);
+            __m128i a0 = mm_loadu_si32((__m128i*)&input[2*i]);
             __m128i a1 = a0;
 
             // deinterleave and sign-extend
@@ -878,9 +890,9 @@ void AudioSRC::convertInput(const int16_t* input, float** outputs, int numFrames
             _mm_storeu_ps(&outputs[3][i], _mm_shuffle_ps(f1, f3, _MM_SHUFFLE(3,1,3,1)));
         }
         for (; i < numFrames; i++) {
-            __m128i a0 = _mm_cvtsi32_si128(*(int32_t*)&input[4*i+0]);
+            __m128i a0 = mm_loadu_si32((__m128i*)&input[4*i+0]);
             __m128i a1 = a0;
-            __m128i a2 = _mm_cvtsi32_si128(*(int32_t*)&input[4*i+2]);
+            __m128i a2 = mm_loadu_si32((__m128i*)&input[4*i+2]);
             __m128i a3 = a2;
 
             // deinterleave and sign-extend
@@ -986,7 +998,7 @@ void AudioSRC::convertOutput(float** inputs, int16_t* output, int numFrames) {
 
             // interleave
             a0 = _mm_unpacklo_epi16(a0, a1);
-            *(int32_t*)&output[2*i] = _mm_cvtsi128_si32(a0);
+            mm_storeu_si32((__m128i*)&output[2*i], a0);
         }
 
     } else if (_numChannels == 4) {

From fa4dfffd8ec55f5629b994327c7a06af4ddd8ab1 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Tue, 18 Jun 2019 09:53:54 -0700
Subject: [PATCH 06/18] Update reverb SIMD to avoid benign UBSan warnings due
 to unaligned load/store

---
 libraries/audio/src/AudioReverb.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/libraries/audio/src/AudioReverb.cpp b/libraries/audio/src/AudioReverb.cpp
index a7c6fefd39..4d89172a38 100644
--- a/libraries/audio/src/AudioReverb.cpp
+++ b/libraries/audio/src/AudioReverb.cpp
@@ -1796,6 +1796,18 @@ void AudioReverb::render(float** inputs, float** outputs, int numFrames) {
 
 #include <emmintrin.h>
 
+// unaligned load/store without undefined behavior
+static inline __m128i mm_loadu_si32(void const* mem_addr) {
+    int32_t temp;
+    memcpy(&temp, mem_addr, sizeof(int32_t));
+    return _mm_cvtsi32_si128(temp);
+}
+
+static inline void mm_storeu_si32(void* mem_addr, __m128i a) {
+   int32_t temp = _mm_cvtsi128_si32(a);
+   memcpy(mem_addr, &temp, sizeof(int32_t));
+}
+
 // convert int16_t to float, deinterleave stereo
 void AudioReverb::convertInput(const int16_t* input, float** outputs, int numFrames) {
     __m128 scale = _mm_set1_ps(1/32768.0f);
@@ -1816,7 +1828,7 @@ void AudioReverb::convertInput(const int16_t* input, float** outputs, int numFra
         _mm_storeu_ps(&outputs[1][i], f1);
     }
     for (; i < numFrames; i++) {
-        __m128i a0 = _mm_cvtsi32_si128(*(int32_t*)&input[2*i]);
+        __m128i a0 = mm_loadu_si32((__m128i*)&input[2*i]);
         __m128i a1 = a0;
 
         // deinterleave and sign-extend
@@ -1887,7 +1899,7 @@ void AudioReverb::convertOutput(float** inputs, int16_t* output, int numFrames)
 
         // interleave
         a0 = _mm_unpacklo_epi16(a0, a1);
-        *(int32_t*)&output[2*i] = _mm_cvtsi128_si32(a0);
+        mm_storeu_si32((__m128i*)&output[2*i], a0);
     }
 }
 

From ce7571dcc13cfb3156c4c77449d4668b8971d3fe Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Tue, 18 Jun 2019 10:29:23 -0700
Subject: [PATCH 07/18] Replace NEXTPOW2() macros with constexpr (supported
 since VS2015)

---
 libraries/audio/src/AudioReverb.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/libraries/audio/src/AudioReverb.cpp b/libraries/audio/src/AudioReverb.cpp
index 4d89172a38..26f5528866 100644
--- a/libraries/audio/src/AudioReverb.cpp
+++ b/libraries/audio/src/AudioReverb.cpp
@@ -35,16 +35,6 @@ static const double SQRT2 = 1.41421356237309504880;
 static const double FIXQ31 = 2147483648.0;
 static const double FIXQ32 = 4294967296.0;
 
-// Round an integer to the next power-of-two, at compile time.
-// VS2013 does not support constexpr so macros are used instead.
-#define SETBITS0(x) (x)
-#define SETBITS1(x) (SETBITS0(x) | (SETBITS0(x) >>  1))
-#define SETBITS2(x) (SETBITS1(x) | (SETBITS1(x) >>  2))
-#define SETBITS3(x) (SETBITS2(x) | (SETBITS2(x) >>  4))
-#define SETBITS4(x) (SETBITS3(x) | (SETBITS3(x) >>  8))
-#define SETBITS5(x) (SETBITS4(x) | (SETBITS4(x) >> 16))
-#define NEXTPOW2(x) (SETBITS5((x) - 1) + 1)
-
 //
 // Allpass delay modulation
 //
@@ -111,6 +101,18 @@ static const int M_AP19 = 113;
 static const int M_AP20 = 107;
 static const int M_AP21 = 127;
 
+// Round an integer to the next power-of-two, at compile time
+constexpr uint32_t NEXTPOW2(uint32_t n) {
+    n -= 1;
+    n |= (n >> 1);
+    n |= (n >> 2);
+    n |= (n >> 4);
+    n |= (n >> 8);
+    n |= (n >> 16);
+    n += 1;
+    return n;
+}
+
 //
 // Filter design tools using analog-matched response.
 // All filter types approximate the s-plane response, including cutoff > Nyquist.

From 34def0fd6ba15d10df836880ec46fbd2ce65a780 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 18 Jun 2019 11:09:15 -0700
Subject: [PATCH 08/18] DEV-145: About screen for platform info

---
 .../simplifiedUI/settingsApp/SettingsApp.qml  |  15 +-
 .../simplifiedUI/settingsApp/about/About.qml  | 176 ++++++++++++++++++
 2 files changed, 190 insertions(+), 1 deletion(-)
 create mode 100644 interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml

diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
index adb8344902..1f48d1d753 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
@@ -17,6 +17,7 @@ import "./audio" as AudioSettings
 import "./general" as GeneralSettings
 import "./vr" as VrSettings
 import "./dev" as DevSettings
+import "./about" as AboutSettings
 
 Rectangle {
     property string activeTabView: "generalTabView"
@@ -76,6 +77,10 @@ Rectangle {
                 tabTitle: "VR"
                 tabViewName: "vrTabView"
             }
+            ListElement {
+                tabTitle: "About"
+                tabViewName: "aboutTabView"
+            }
             ListElement {
                 tabTitle: "Dev"
                 tabViewName: "devTabView"
@@ -103,7 +108,7 @@ Rectangle {
             delegate: Item {
                 visible: model.tabTitle !== "Dev" || (model.tabTitle === "Dev" && root.developerModeEnabled)
 
-                width: tabTitleText.paintedWidth + 64
+                width: tabTitleText.paintedWidth + 32
                 height: parent.height
 
                 HifiStylesUit.GraphikRegular {
@@ -163,6 +168,12 @@ Rectangle {
             anchors.fill: parent
         }
 
+        AboutSettings.About {
+            id: aboutTabViewContainer
+            visible: activeTabView === "aboutTabView"
+            anchors.fill: parent
+        }
+
         SimplifiedControls.VerticalScrollBar {
             parent: {
                 if (activeTabView === "generalTabView") {
@@ -173,6 +184,8 @@ Rectangle {
                     vrTabViewContainer
                 } else if (activeTabView === "devTabView") {
                     devTabViewContainer
+                } else if (activeTabView === "aboutTabView") {
+                    aboutTabViewContainer
                 }
             }
         }
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
new file mode 100644
index 0000000000..7f0dcc2289
--- /dev/null
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
@@ -0,0 +1,176 @@
+//
+//  About.qml
+//
+//  Created by Zach Fox on 2019-06-18
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+import "../../simplifiedConstants" as SimplifiedConstants
+import "../../simplifiedControls" as SimplifiedControls
+import stylesUit 1.0 as HifiStylesUit
+import QtQuick.Layouts 1.3
+
+Flickable {
+    id: root
+    contentWidth: parent.width
+    contentHeight: aboutColumnLayout.height
+    clip: true
+
+    onVisibleChanged: {
+        if (visible) {
+            root.contentX = 0;
+            root.contentY = 0;
+        }
+    }
+
+
+    SimplifiedConstants.SimplifiedConstants {
+        id: simplifiedUI
+    }
+
+
+    Image {
+        id: accent
+        source: "../images/accent3.svg"
+        anchors.left: parent.left
+        anchors.top: parent.top
+        width: 83
+        height: 156
+        transform: Scale {
+            xScale: -1
+            origin.x: accent.width / 2
+            origin.y: accent.height / 2
+        }
+    }
+
+
+    ColumnLayout {
+        id: aboutColumnLayout
+        anchors.left: parent.left
+        anchors.leftMargin: 26
+        anchors.right: parent.right
+        anchors.rightMargin: 26
+        anchors.top: parent.top
+        spacing: simplifiedUI.margins.settings.spacingBetweenSettings
+        
+        ColumnLayout {
+            id: platformInfoContainer
+            Layout.preferredWidth: parent.width
+            Layout.topMargin: 24
+            Layout.bottomMargin: 24
+            spacing: 0
+
+            HifiStylesUit.GraphikSemiBold {
+                id: platformInfoTitle
+                text: "Platform Info"
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 22
+                color: simplifiedUI.colors.text.white
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b>Platform Tier:</b> " + PlatformInfo.getTierProfiled()
+                Layout.maximumWidth: parent.width
+                Layout.topMargin: 14
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b>OS Type:</b> " + PlatformInfo.getOperatingSystemType()
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b>CPU:</b> " + PlatformInfo.getCPUBrand()
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b># CPUs:</b> " + PlatformInfo.getNumCPUs()
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b># CPU Cores:</b> " + PlatformInfo.getNumLogicalCores()
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b>RAM:</b> " + PlatformInfo.getTotalSystemMemoryMB() + " MB"
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b>GPU Type:</b> " + PlatformInfo.getGraphicsCardType()
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b>VR Hand Controllers:</b> " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None"))
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            SimplifiedControls.Button {
+                Layout.topMargin: 24
+                width: 200
+                height: 32
+                text: "Copy to Clipboard"
+
+                onClicked: {
+                    Window.copyToClipboard(root.buildPlatformInfoTextToCopy());
+                }
+            }
+        }
+    }
+
+    function buildPlatformInfoTextToCopy() {
+        var textToCopy = "Platform Info:\n";
+        textToCopy += "Platform Tier: " + PlatformInfo.getTierProfiled() + "\n";
+        textToCopy += "OS Type: " + PlatformInfo.getOperatingSystemType() + "\n";
+        textToCopy += "CPU: " + PlatformInfo.getCPUBrand() + "\n";
+        textToCopy += "# CPUs: " + PlatformInfo.getNumCPUs() + "\n";
+        textToCopy += "# CPU Cores: " + PlatformInfo.getNumLogicalCores() + "\n";
+        textToCopy += "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB\n";
+        textToCopy += "GPU Type: " + PlatformInfo.getGraphicsCardType() + "\n";
+        textToCopy += "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None"));
+
+        return textToCopy;
+    }
+}

From ec4fc672b6b0a7758eae15c5db19f4b5b7956d8f Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 18 Jun 2019 11:29:20 -0700
Subject: [PATCH 09/18] Better design; Interface version

---
 .../simplifiedUI/settingsApp/about/About.qml  | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
index 7f0dcc2289..a79aa82336 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
@@ -66,18 +66,36 @@ Flickable {
             spacing: 0
 
             HifiStylesUit.GraphikSemiBold {
-                id: platformInfoTitle
-                text: "Platform Info"
+                text: "About Interface"
                 Layout.maximumWidth: parent.width
+                Layout.bottomMargin: 14
                 height: paintedHeight
                 size: 22
                 color: simplifiedUI.colors.text.white
             }
 
             HifiStylesUit.GraphikRegular {
-                text: "<b>Platform Tier:</b> " + PlatformInfo.getTierProfiled()
+                text: "<b>Interface Version:</b> " + Window.checkVersion()
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            HifiStylesUit.GraphikSemiBold {
+                text: "Platform Info"
+                Layout.maximumWidth: parent.width
+                Layout.topMargin: 24
+                Layout.bottomMargin: 14
+                height: paintedHeight
+                size: 22
+                color: simplifiedUI.colors.text.white
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b>Profiled Platform Tier:</b> " + PlatformInfo.getTierProfiled()
                 Layout.maximumWidth: parent.width
-                Layout.topMargin: 14
                 height: paintedHeight
                 size: 16
                 color: simplifiedUI.colors.text.white
@@ -130,7 +148,7 @@ Flickable {
             }
 
             HifiStylesUit.GraphikRegular {
-                text: "<b>GPU Type:</b> " + PlatformInfo.getGraphicsCardType()
+                text: "<b>GPU:</b> " + PlatformInfo.getGraphicsCardType()
                 Layout.maximumWidth: parent.width
                 height: paintedHeight
                 size: 16
@@ -161,14 +179,16 @@ Flickable {
     }
 
     function buildPlatformInfoTextToCopy() {
-        var textToCopy = "Platform Info:\n";
-        textToCopy += "Platform Tier: " + PlatformInfo.getTierProfiled() + "\n";
+        var textToCopy = "About Interface:\n";
+        textToCopy += "Interface Version: " + Window.checkVersion() + "\n";
+        textToCopy += "\nPlatform Info:\n";
+        textToCopy += "Profiled Platform Tier: " + PlatformInfo.getTierProfiled() + "\n";
         textToCopy += "OS Type: " + PlatformInfo.getOperatingSystemType() + "\n";
         textToCopy += "CPU: " + PlatformInfo.getCPUBrand() + "\n";
         textToCopy += "# CPUs: " + PlatformInfo.getNumCPUs() + "\n";
         textToCopy += "# CPU Cores: " + PlatformInfo.getNumLogicalCores() + "\n";
         textToCopy += "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB\n";
-        textToCopy += "GPU Type: " + PlatformInfo.getGraphicsCardType() + "\n";
+        textToCopy += "GPU: " + PlatformInfo.getGraphicsCardType() + "\n";
         textToCopy += "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None"));
 
         return textToCopy;

From 4670c113971ac9d2c0d381e960c9c52e33646df3 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 18 Jun 2019 12:26:03 -0700
Subject: [PATCH 10/18] Tighten up the graphics on level 3

---
 .../simplifiedUI/settingsApp/about/About.qml  |  40 ++++++------------
 .../settingsApp/about/images/logo.png         | Bin 0 -> 16487 bytes
 2 files changed, 13 insertions(+), 27 deletions(-)
 create mode 100644 interface/resources/qml/hifi/simplifiedUI/settingsApp/about/images/logo.png

diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
index a79aa82336..83a21ff0d7 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
@@ -34,21 +34,6 @@ Flickable {
     }
 
 
-    Image {
-        id: accent
-        source: "../images/accent3.svg"
-        anchors.left: parent.left
-        anchors.top: parent.top
-        width: 83
-        height: 156
-        transform: Scale {
-            xScale: -1
-            origin.x: accent.width / 2
-            origin.y: accent.height / 2
-        }
-    }
-
-
     ColumnLayout {
         id: aboutColumnLayout
         anchors.left: parent.left
@@ -56,26 +41,27 @@ Flickable {
         anchors.right: parent.right
         anchors.rightMargin: 26
         anchors.top: parent.top
-        spacing: simplifiedUI.margins.settings.spacingBetweenSettings
+        spacing: 0
+
+        Image {
+            source: "images/logo.png"
+            Layout.alignment: Qt.AlignHCenter
+            Layout.topMargin: 16
+            Layout.preferredWidth: 240
+            Layout.preferredHeight: 180
+            fillMode: Image.PreserveAspectFit
+            mipmap: true
+        }
         
         ColumnLayout {
             id: platformInfoContainer
             Layout.preferredWidth: parent.width
-            Layout.topMargin: 24
             Layout.bottomMargin: 24
             spacing: 0
 
             HifiStylesUit.GraphikSemiBold {
-                text: "About Interface"
-                Layout.maximumWidth: parent.width
-                Layout.bottomMargin: 14
-                height: paintedHeight
-                size: 22
-                color: simplifiedUI.colors.text.white
-            }
-
-            HifiStylesUit.GraphikRegular {
-                text: "<b>Interface Version:</b> " + Window.checkVersion()
+                text: "Version " + Window.checkVersion()
+                Layout.alignment: Qt.AlignHCenter
                 Layout.maximumWidth: parent.width
                 height: paintedHeight
                 size: 16
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/images/logo.png b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d480da86ddc13c61dee02443563bfed4022ecdbc
GIT binary patch
literal 16487
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
R|K+Cu40TO)>TV%o|1Sn<8bSa7

literal 0
HcmV?d00001


From bd02a5eafd7b568c106bc033c6ad4dd22563beba Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 18 Jun 2019 12:29:52 -0700
Subject: [PATCH 11/18] Better text formatting

---
 .../qml/hifi/simplifiedUI/settingsApp/about/About.qml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
index 83a21ff0d7..6c1f4a3b57 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
@@ -165,9 +165,9 @@ Flickable {
     }
 
     function buildPlatformInfoTextToCopy() {
-        var textToCopy = "About Interface:\n";
+        var textToCopy = "**About Interface**\n";
         textToCopy += "Interface Version: " + Window.checkVersion() + "\n";
-        textToCopy += "\nPlatform Info:\n";
+        textToCopy += "\n**Platform Info**\n";
         textToCopy += "Profiled Platform Tier: " + PlatformInfo.getTierProfiled() + "\n";
         textToCopy += "OS Type: " + PlatformInfo.getOperatingSystemType() + "\n";
         textToCopy += "CPU: " + PlatformInfo.getCPUBrand() + "\n";

From f6822f17a95a2da4bf02717854c0c07047d601bb Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 18 Jun 2019 12:43:45 -0700
Subject: [PATCH 12/18] Add computer description

---
 .../simplifiedUI/settingsApp/about/About.qml  | 46 +++++++++++++++++--
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
index 6c1f4a3b57..76ab762a6b 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
@@ -47,8 +47,8 @@ Flickable {
             source: "images/logo.png"
             Layout.alignment: Qt.AlignHCenter
             Layout.topMargin: 16
-            Layout.preferredWidth: 240
-            Layout.preferredHeight: 180
+            Layout.preferredWidth: 200
+            Layout.preferredHeight: 150
             fillMode: Image.PreserveAspectFit
             mipmap: true
         }
@@ -72,11 +72,35 @@ Flickable {
             HifiStylesUit.GraphikSemiBold {
                 text: "Platform Info"
                 Layout.maximumWidth: parent.width
-                Layout.topMargin: 24
-                Layout.bottomMargin: 14
+                Layout.topMargin: 8
+                Layout.bottomMargin: 8
                 height: paintedHeight
                 size: 22
                 color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+            }
+
+            HifiStylesUit.GraphikRegular {
+                text: "<b>Computer Vendor/Model:</b>"
+                Layout.maximumWidth: parent.width
+                height: paintedHeight
+                size: 16
+                color: simplifiedUI.colors.text.white
+                wrapMode: Text.Wrap
+
+                Component.onCompleted: {
+                    var computer = JSON.parse(PlatformInfo.getComputer());
+                    var computerVendor = computer.vendor;
+                    if (computerVendor.length === 0) {
+                        computerVendor = "Unknown";
+                    }
+                    var computerModel = computer.model;
+                    if (computerModel.length === 0) {
+                        computerModel = "Unknown";
+                    }
+
+                    text = "<b>Computer Vendor/Model:</b> " + computerVendor + "/" + computerModel;
+                }
             }
 
             HifiStylesUit.GraphikRegular {
@@ -152,7 +176,7 @@ Flickable {
             }
 
             SimplifiedControls.Button {
-                Layout.topMargin: 24
+                Layout.topMargin: 8
                 width: 200
                 height: 32
                 text: "Copy to Clipboard"
@@ -168,6 +192,18 @@ Flickable {
         var textToCopy = "**About Interface**\n";
         textToCopy += "Interface Version: " + Window.checkVersion() + "\n";
         textToCopy += "\n**Platform Info**\n";
+
+        var computer = JSON.parse(PlatformInfo.getComputer());
+        var computerVendor = computer.vendor;
+        if (computerVendor.length === 0) {
+            computerVendor = "Unknown";
+        }
+        var computerModel = computer.model;
+        if (computerModel.length === 0) {
+            computerModel = "Unknown";
+        }
+
+        textToCopy += "Computer Vendor/Model: " + computerVendor + "/" + computerModel + "\n";
         textToCopy += "Profiled Platform Tier: " + PlatformInfo.getTierProfiled() + "\n";
         textToCopy += "OS Type: " + PlatformInfo.getOperatingSystemType() + "\n";
         textToCopy += "CPU: " + PlatformInfo.getCPUBrand() + "\n";

From 18f703ee4304a711d57d32332924d12810391e88 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 18 Jun 2019 14:11:14 -0700
Subject: [PATCH 13/18] BUGZ-732: Enable text selection by mouse in
 Profile/Display Name field

---
 .../hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml
index a6be398e53..becbd8ca61 100644
--- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml
@@ -94,6 +94,7 @@ Item {
                 text: MyAvatar.sessionDisplayName === "" ? MyAvatar.displayName : MyAvatar.sessionDisplayName
                 maximumLength: 256
                 clip: true
+                selectByMouse: true
                 anchors.fill: parent
                 onEditingFinished: {
                     if (MyAvatar.displayName !== text) {

From 0a2f37f9a08cac291e0c687694b072cc66e69d65 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 18 Jun 2019 15:36:32 -0700
Subject: [PATCH 14/18] Q_OBJECT and template classes don't mix

---
 libraries/shared/src/Preferences.h | 117 ++++++++++++++++++++---------
 1 file changed, 81 insertions(+), 36 deletions(-)

diff --git a/libraries/shared/src/Preferences.h b/libraries/shared/src/Preferences.h
index 9f84d9c8b7..9147117792 100644
--- a/libraries/shared/src/Preferences.h
+++ b/libraries/shared/src/Preferences.h
@@ -115,48 +115,39 @@ protected:
     const Lambda _triggerHandler;
 };
 
-
-template <typename T>
-class TypedPreference : public Preference {
-public:
-    using Getter = std::function<T()>;
-    using Setter = std::function<void(const T&)>;
-
-    TypedPreference(const QString& category, const QString& name, Getter getter, Setter setter)
-        : Preference(category, name), _getter(getter), _setter(setter) { }
-
-    T getValue() const { return _value; }
-    void setValue(const T& value) { if (_value != value) { _value = value; emitValueChanged(); } }
-    void load() override { _value = _getter(); }
-    void save() const override { 
-        T oldValue = _getter();
-        if (_value != oldValue) {
-            _setter(_value); 
-        } 
-    }
-
-protected:
-    T _value;
-    const Getter _getter;
-    const Setter _setter;
-};
-
-class BoolPreference : public TypedPreference<bool> {
+class BoolPreference : public Preference {
     Q_OBJECT
     Q_PROPERTY(bool value READ getValue WRITE setValue NOTIFY valueChanged)
 
 public:
+    using Getter = std::function<bool()>;
+    using Setter = std::function<void(const bool&)>;
+
     BoolPreference(const QString& category, const QString& name, Getter getter, Setter setter)
-        : TypedPreference(category, name, getter, setter) { }
+        : Preference(category, name), _getter(getter), _setter(setter) { }
+
+    bool getValue() const { return _value; }
+    void setValue(const bool& value) { if (_value != value) { _value = value; emitValueChanged(); } }
+    void load() override { _value = _getter(); }
+    void save() const override {
+        bool oldValue = _getter();
+        if (_value != oldValue) {
+            _setter(_value);
+        }
+    }
 
 signals:
     void valueChanged();
 
 protected:
+    bool _value;
+    const Getter _getter;
+    const Setter _setter;
+
     void emitValueChanged() override { emit valueChanged(); }
 };
 
-class FloatPreference : public TypedPreference<float> {
+class FloatPreference : public Preference {
     Q_OBJECT
     Q_PROPERTY(float value READ getValue WRITE setValue NOTIFY valueChanged)
     Q_PROPERTY(float min READ getMin CONSTANT)
@@ -165,8 +156,21 @@ class FloatPreference : public TypedPreference<float> {
     Q_PROPERTY(float decimals READ getDecimals CONSTANT)
 
 public:
+    using Getter = std::function<float()>;
+    using Setter = std::function<void(const float&)>;
+
     FloatPreference(const QString& category, const QString& name, Getter getter, Setter setter)
-        : TypedPreference(category, name, getter, setter) { }
+        : Preference(category, name), _getter(getter), _setter(setter) { }
+
+    float getValue() const { return _value; }
+    void setValue(const float& value) { if (_value != value) { _value = value; emitValueChanged(); } }
+    void load() override { _value = _getter(); }
+    void save() const override {
+        float oldValue = _getter();
+        if (_value != oldValue) {
+            _setter(_value);
+        }
+    }
 
     float getMin() const { return _min; }
     void setMin(float min) { _min = min; };
@@ -186,14 +190,17 @@ signals:
 protected:
     void emitValueChanged() override { emit valueChanged(); }
 
+    float _value;
+    const Getter _getter;
+    const Setter _setter;
+
     float _decimals { 0 };
     float _min { 0 };
     float _max { 1 };
     float _step { 0.1f };
 };
 
-
-class IntPreference : public TypedPreference<int> {
+class IntPreference : public Preference {
     Q_OBJECT
     Q_PROPERTY(float value READ getValue WRITE setValue NOTIFY valueChanged)
     Q_PROPERTY(float min READ getMin CONSTANT)
@@ -202,8 +209,21 @@ class IntPreference : public TypedPreference<int> {
     Q_PROPERTY(int decimals READ getDecimals CONSTANT)
 
 public:
+    using Getter = std::function<int()>;
+    using Setter = std::function<void(const int&)>;
+
     IntPreference(const QString& category, const QString& name, Getter getter, Setter setter)
-        : TypedPreference(category, name, getter, setter) { }
+        : Preference(category, name), _getter(getter), _setter(setter) { }
+
+    int getValue() const { return _value; }
+    void setValue(const int& value) { if (_value != value) { _value = value; emitValueChanged(); } }
+    void load() override { _value = _getter(); }
+    void save() const override {
+        int oldValue = _getter();
+        if (_value != oldValue) {
+            _setter(_value);
+        }
+    }
 
     float getMin() const { return _min; }
     void setMin(float min) { _min = min; };
@@ -221,6 +241,10 @@ signals:
     void valueChanged();
 
 protected:
+    int _value;
+    const Getter _getter;
+    const Setter _setter;
+
     void emitValueChanged() override { emit valueChanged(); }
 
     int _min { std::numeric_limits<int>::min() };
@@ -229,19 +253,37 @@ protected:
     int _decimals { 0 };
 };
 
-class StringPreference : public TypedPreference<QString> {
+class StringPreference : public Preference {
     Q_OBJECT
     Q_PROPERTY(QString value READ getValue WRITE setValue NOTIFY valueChanged)
 
 public:
+    using Getter = std::function<QString()>;
+    using Setter = std::function<void(const QString&)>;
+
     StringPreference(const QString& category, const QString& name, Getter getter, Setter setter)
-        : TypedPreference(category, name, getter, setter) { }
+        : Preference(category, name), _getter(getter), _setter(setter) { }
+
+
+    QString getValue() const { return _value; }
+    void setValue(const QString& value) { if (_value != value) { _value = value; emitValueChanged(); } }
+    void load() override { _value = _getter(); }
+    void save() const override {
+        QString oldValue = _getter();
+        if (_value != oldValue) {
+            _setter(_value);
+        }
+    }
 
 signals:
     void valueChanged();
 
 protected:
     void emitValueChanged() override { emit valueChanged(); }
+
+    QString _value;
+    const Getter _getter;
+    const Setter _setter;
 };
 
 class SliderPreference : public FloatPreference {
@@ -303,7 +345,7 @@ public:
     ComboBoxPreference(const QString& category, const QString& name, Getter getter, Setter setter)
         : EditPreference(category, name, getter, setter) { }
     Type getType() override { return ComboBox; }
- 
+
     const QStringList& getItems() { return _items; }
     void setItems(const QStringList& items) { _items = items; }
 
@@ -342,6 +384,9 @@ class CheckPreference : public BoolPreference {
     Q_OBJECT
     Q_PROPERTY(bool indented READ getIndented CONSTANT)
 public:
+    using Getter = std::function<bool()>;
+    using Setter = std::function<void(const bool&)>;
+
     CheckPreference(const QString& category, const QString& name, Getter getter, Setter setter)
         : BoolPreference(category, name, getter, setter) { }
     Type getType() override { return Checkbox; }

From 06b00e93ae3b9c0653a0eedbb8783498e3bacc14 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Tue, 18 Jun 2019 15:43:14 -0700
Subject: [PATCH 15/18] Limit the stats-dump on packet error

---
 libraries/networking/src/LimitedNodeList.cpp | 17 ++++++++++-------
 libraries/networking/src/LimitedNodeList.h   |  3 +++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 8fefe5820c..4282e05542 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -450,13 +450,16 @@ qint64 LimitedNodeList::sendPacket(std::unique_ptr<NLPacket> packet, const HifiS
         auto size = sendUnreliablePacket(*packet, sockAddr, hmacAuth);
         if (size < 0) {
             auto now = usecTimestampNow();
-            eachNode([now](const SharedNodePointer & node) {
-                qCDebug(networking) << "Stats for " << node->getPublicSocket() << "\n"
-                    << "    Last Heard Microstamp: " << node->getLastHeardMicrostamp() << " (" << (now - node->getLastHeardMicrostamp()) << "usec ago)\n"
-                    << "    Outbound Kbps: " << node->getOutboundKbps() << "\n"
-                    << "    Inbound Kbps: " << node->getInboundKbps() << "\n"
-                    << "    Ping: " << node->getPingMs();
-            });
+            if (now - _sendErrorStatsTime > ERROR_STATS_PERIOD_US) {
+                _sendErrorStatsTime = now;
+                eachNode([now](const SharedNodePointer& node) {
+                    qCDebug(networking) << "Stats for " << node->getPublicSocket() << "\n"
+                        << "    Last Heard Microstamp: " << node->getLastHeardMicrostamp() << " (" << (now - node->getLastHeardMicrostamp()) << "usec ago)\n"
+                        << "    Outbound Kbps: " << node->getOutboundKbps() << "\n"
+                        << "    Inbound Kbps: " << node->getInboundKbps() << "\n"
+                        << "    Ping: " << node->getPingMs();
+                });
+            }
         }
         return size;
     }
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index f9f6bf3b3e..7e40d763e4 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -497,6 +497,9 @@ private:
     float _outboundKbps { 0.0f };
 
     bool _dropOutgoingNodeTraffic { false };
+
+    quint64 _sendErrorStatsTime { (quint64)0 };
+    static const quint64 ERROR_STATS_PERIOD_US { 2 * USECS_PER_SECOND };
 };
 
 #endif // hifi_LimitedNodeList_h

From 7d808525443da2bc20fb95ef3f4d6b4400a0b956 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Tue, 18 Jun 2019 16:06:47 -0700
Subject: [PATCH 16/18] Reduce reporting period to 1 s

---
 libraries/networking/src/LimitedNodeList.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index 7e40d763e4..5f24401b10 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -499,7 +499,7 @@ private:
     bool _dropOutgoingNodeTraffic { false };
 
     quint64 _sendErrorStatsTime { (quint64)0 };
-    static const quint64 ERROR_STATS_PERIOD_US { 2 * USECS_PER_SECOND };
+    static const quint64 ERROR_STATS_PERIOD_US { 1 * USECS_PER_SECOND };
 };
 
 #endif // hifi_LimitedNodeList_h

From 3ff81607ab36bed17f29ae4ffeb7685d7f03c835 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Tue, 18 Jun 2019 17:17:21 -0700
Subject: [PATCH 17/18] fix deferred rendering on macbook air

---
 .../render-utils/src/DeferredBufferWrite.slh  |  7 ++-
 .../src/DeferredLightingEffect.cpp            | 45 ++++---------------
 .../render-utils/src/DeferredLightingEffect.h | 13 ------
 libraries/render-utils/src/deferred_light.slv |  4 +-
 4 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/libraries/render-utils/src/DeferredBufferWrite.slh b/libraries/render-utils/src/DeferredBufferWrite.slh
index fc9310a520..de4581d66e 100644
--- a/libraries/render-utils/src/DeferredBufferWrite.slh
+++ b/libraries/render-utils/src/DeferredBufferWrite.slh
@@ -37,7 +37,6 @@ void packDeferredFragment(vec3 normal, float alpha, vec3 albedo, float roughness
     _fragColor0 = vec4(albedo, mix(packShadedMetallic(metallic), packScatteringMetallic(metallic), check));
     _fragColor1 = vec4(packNormal(normal), clamp(roughness, 0.0, 1.0));
     _fragColor2 = vec4(mix(emissive, vec3(scattering), check), occlusion);
-    
     _fragColor3 = vec4(isEmissiveEnabled() * emissive, 1.0);
 }
 
@@ -49,7 +48,6 @@ void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 albedo, float r
     _fragColor0 = vec4(albedo, packLightmappedMetallic(metallic));
     _fragColor1 = vec4(packNormal(normal), clamp(roughness, 0.0, 1.0));
     _fragColor2 = vec4(isLightmapEnabled() * lightmap, 1.0);
-
     _fragColor3 = vec4(isLightmapEnabled() * lightmap * albedo, 1.0);
 }
 
@@ -59,7 +57,7 @@ void packDeferredFragmentUnlit(vec3 normal, float alpha, vec3 color) {
     }
     _fragColor0 = vec4(color, packUnlit());
     _fragColor1 = vec4(packNormal(normal), 1.0);
-   // _fragColor2 = vec4(vec3(0.0), 1.0);
+    _fragColor2 = vec4(vec3(0.0), 1.0);
     _fragColor3 = vec4(color, 1.0);
 }
 
@@ -69,7 +67,8 @@ void packDeferredFragmentTranslucent(vec3 normal, float alpha, vec3 albedo, floa
     }
     _fragColor0 = vec4(albedo.rgb, alpha);
     _fragColor1 = vec4(packNormal(normal), clamp(roughness, 0.0, 1.0));
-
+    _fragColor2 = vec4(vec3(0.0), 1.0);
+    _fragColor3 = vec4(0.0);
 }
 
 <@endif@>
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 82b7f3102a..51729fc5cf 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -41,33 +41,17 @@ namespace gr {
 
 using namespace render;
 
-struct LightLocations {
-    bool shadowTransform{ false };
-    void initialize(const gpu::ShaderPointer& program) {
-        shadowTransform = program->getReflection().validUniformBuffer(ru::Buffer::ShadowParams);
-    }
-};
-
-static void loadLightProgram(int programId, bool lightVolume, gpu::PipelinePointer& program, LightLocationsPtr& locations);
+static void loadLightProgram(int programId, bool lightVolume, gpu::PipelinePointer& program);
 
 void DeferredLightingEffect::init() {
-    _directionalAmbientSphereLightLocations = std::make_shared<LightLocations>();
-    _directionalSkyboxLightLocations = std::make_shared<LightLocations>();
+    loadLightProgram(shader::render_utils::program::directional_ambient_light, false, _directionalAmbientSphereLight);
+    loadLightProgram(shader::render_utils::program::directional_skybox_light, false, _directionalSkyboxLight);
 
-    _directionalAmbientSphereLightShadowLocations = std::make_shared<LightLocations>();
-    _directionalSkyboxLightShadowLocations = std::make_shared<LightLocations>();
+    loadLightProgram(shader::render_utils::program::directional_ambient_light_shadow, false, _directionalAmbientSphereLightShadow);
+    loadLightProgram(shader::render_utils::program::directional_skybox_light_shadow, false, _directionalSkyboxLightShadow);
 
-    _localLightLocations = std::make_shared<LightLocations>();
-    _localLightOutlineLocations = std::make_shared<LightLocations>();
-
-    loadLightProgram(shader::render_utils::program::directional_ambient_light, false, _directionalAmbientSphereLight, _directionalAmbientSphereLightLocations);
-    loadLightProgram(shader::render_utils::program::directional_skybox_light, false, _directionalSkyboxLight, _directionalSkyboxLightLocations);
-
-    loadLightProgram(shader::render_utils::program::directional_ambient_light_shadow, false, _directionalAmbientSphereLightShadow, _directionalAmbientSphereLightShadowLocations);
-    loadLightProgram(shader::render_utils::program::directional_skybox_light_shadow, false, _directionalSkyboxLightShadow, _directionalSkyboxLightShadowLocations);
-
-    loadLightProgram(shader::render_utils::program::local_lights_shading, true, _localLight, _localLightLocations);
-    loadLightProgram(shader::render_utils::program::local_lights_drawOutline, true, _localLightOutline, _localLightOutlineLocations);
+    loadLightProgram(shader::render_utils::program::local_lights_shading, true, _localLight);
+    loadLightProgram(shader::render_utils::program::local_lights_drawOutline, true, _localLightOutline);
 }
 
 // FIXME: figure out how to move lightFrame into a varying in GeometryCache and RenderPipelines
@@ -123,15 +107,9 @@ void DeferredLightingEffect::unsetLocalLightsBatch(gpu::Batch& batch) {
     batch.setUniformBuffer(ru::Buffer::LightClusterFrustumGrid, nullptr);
 }
 
-static gpu::ShaderPointer makeLightProgram(int programId, LightLocationsPtr& locations) {
+static void loadLightProgram(int programId, bool lightVolume, gpu::PipelinePointer& pipeline) {
+
     gpu::ShaderPointer program = gpu::Shader::createProgram(programId);
-    locations->initialize(program);
-    return program;
-}
-
-static void loadLightProgram(int programId, bool lightVolume, gpu::PipelinePointer& pipeline, LightLocationsPtr& locations) {
-
-    gpu::ShaderPointer program = makeLightProgram(programId, locations);
 
     auto state = std::make_shared<gpu::State>();
     state->setColorWriteMask(true, true, true, false);
@@ -456,7 +434,6 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
 
         // Setup the global directional pass pipeline
         auto program = deferredLightingEffect->_directionalSkyboxLight;
-        LightLocationsPtr locations = deferredLightingEffect->_directionalSkyboxLightLocations;
         {
             if (keyLightCastShadows) {
 
@@ -464,20 +441,16 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
                 // otherwise use the ambient sphere version
                 if (hasAmbientMap) {
                     program = deferredLightingEffect->_directionalSkyboxLightShadow;
-                    locations = deferredLightingEffect->_directionalSkyboxLightShadowLocations;
                 } else {
                     program = deferredLightingEffect->_directionalAmbientSphereLightShadow;
-                    locations = deferredLightingEffect->_directionalAmbientSphereLightShadowLocations;
                 }
             } else {
                 // If the keylight has an ambient Map then use the Skybox version of the pass
                 // otherwise use the ambient sphere version
                 if (hasAmbientMap) {
                     program = deferredLightingEffect->_directionalSkyboxLight;
-                    locations = deferredLightingEffect->_directionalSkyboxLightLocations;
                 } else {
                     program = deferredLightingEffect->_directionalAmbientSphereLight;
-                    locations = deferredLightingEffect->_directionalAmbientSphereLightLocations;
                 }
             }
 
diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h
index 1cc6ca4767..84b3127443 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.h
+++ b/libraries/render-utils/src/DeferredLightingEffect.h
@@ -37,10 +37,6 @@
 #include "SubsurfaceScattering.h"
 #include "AmbientOcclusionEffect.h"
 
-
-struct LightLocations;
-using LightLocationsPtr = std::shared_ptr<LightLocations>;
-
 // THis is where we currently accumulate the local lights, let s change that sooner than later
 class DeferredLightingEffect : public Dependency {
     SINGLETON_DEPENDENCY
@@ -72,15 +68,6 @@ private:
     gpu::PipelinePointer _localLight;
     gpu::PipelinePointer _localLightOutline;
 
-    LightLocationsPtr _directionalSkyboxLightLocations;
-    LightLocationsPtr _directionalAmbientSphereLightLocations;
-
-    LightLocationsPtr _directionalSkyboxLightShadowLocations;
-    LightLocationsPtr _directionalAmbientSphereLightShadowLocations;
-
-    LightLocationsPtr _localLightLocations;
-    LightLocationsPtr _localLightOutlineLocations;
-
     friend class LightClusteringPass;
     friend class RenderDeferredSetup;
     friend class RenderDeferredLocals;
diff --git a/libraries/render-utils/src/deferred_light.slv b/libraries/render-utils/src/deferred_light.slv
index 164fd9fb3b..2a68aa0e27 100644
--- a/libraries/render-utils/src/deferred_light.slv
+++ b/libraries/render-utils/src/deferred_light.slv
@@ -18,7 +18,7 @@ layout(location=RENDER_UTILS_ATTR_TEXCOORD01) out vec4 _texCoord01;
 
 void main(void) {
     const float depth = 1.0;
-    const vec4 UNIT_QUAD[4] = vec4[4](
+    const mat4 UNIT_QUAD = mat4(
         vec4(-1.0, -1.0, depth, 1.0),
         vec4(1.0, -1.0, depth, 1.0),
         vec4(-1.0, 1.0, depth, 1.0),
@@ -26,7 +26,7 @@ void main(void) {
     );
     vec4 pos = UNIT_QUAD[gl_VertexID];
 
-    _texCoord01.xy = (pos.xy + 1.0) * 0.5;
+    _texCoord01 = vec4((pos.xy + 1.0) * 0.5, 0.0, 0.0);
 
     gl_Position = pos;
 }

From 96179328e00c3e988a9b7114c9232d76ee1cb0c7 Mon Sep 17 00:00:00 2001
From: Anthony Thibault <ajt.hyperlogic@gmail.com>
Date: Wed, 19 Jun 2019 11:20:32 -0700
Subject: [PATCH 18/18] nitpick: [mac] preserve symlinks when installing
 interface.app

---
 tools/nitpick/src/TestRunnerDesktop.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/nitpick/src/TestRunnerDesktop.cpp b/tools/nitpick/src/TestRunnerDesktop.cpp
index b9caaa0ecb..acb5cc77b9 100644
--- a/tools/nitpick/src/TestRunnerDesktop.cpp
+++ b/tools/nitpick/src/TestRunnerDesktop.cpp
@@ -265,8 +265,8 @@ void TestRunnerDesktop::runInstaller() {
         folderName += QString(" - ") + getPRNumberFromURL(_url->text());
     }
 
-    script.write((QString("cp -rf \"$VOLUME/") + folderName + "/interface.app\" \"" + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
-    script.write((QString("cp -rf \"$VOLUME/") + folderName + "/Sandbox.app\" \""   + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
+    script.write((QString("cp -Rf \"$VOLUME/") + folderName + "/interface.app\" \"" + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
+    script.write((QString("cp -Rf \"$VOLUME/") + folderName + "/Sandbox.app\" \""   + _workingFolder + "/High_Fidelity/\"\n").toStdString().c_str());
     
     script.write("hdiutil detach \"$VOLUME\"\n");
     script.write("killall yes\n");