From b46219241ce428b82e0252081b00af69969308be Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Mon, 26 Jun 2017 22:44:31 -0400
Subject: [PATCH 01/78] add peakValueListChanged scaffolding

---
 libraries/audio-client/src/AudioClient.cpp     | 12 +++++++++---
 libraries/audio-client/src/AudioClient.h       | 10 +++++++++-
 libraries/audio-client/src/AudioPeakValues.cpp | 16 ++++++++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 libraries/audio-client/src/AudioPeakValues.cpp

diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index fc54a04a5e..7a1d8edccd 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -224,13 +224,18 @@ AudioClient::AudioClient() :
     // start a thread to detect any device changes
     _checkDevicesTimer = new QTimer(this);
     connect(_checkDevicesTimer, &QTimer::timeout, [this] {
-        QtConcurrent::run(QThreadPool::globalInstance(), [this] {
-            checkDevices();
-        });
+        QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkDevices(); });
     });
     const unsigned long DEVICE_CHECK_INTERVAL_MSECS = 2 * 1000;
     _checkDevicesTimer->start(DEVICE_CHECK_INTERVAL_MSECS);
 
+    // start a thread to detect peak value changes
+    _checkPeakValuesTimer = new QTimer(this);
+    connect(_checkPeakValuesTimer, &QTimer::timeout, [this] {
+        QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkPeakValues(); });
+    });
+    const unsigned long PEAK_VALUES_CHECK_INTERVAL_SECS = 50;
+
 
     configureReverb();
 
@@ -262,6 +267,7 @@ void AudioClient::cleanupBeforeQuit() {
     stop();
 
     _checkDevicesTimer->stop();
+    _checkPeakValuesTimer->stop();
 }
 
 void AudioClient::handleMismatchAudioFormat(SharedNodePointer node, const QString& currentCodec, const QString& recievedCodec) {
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index 54ce3aa6c2..79e82526c6 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -148,6 +148,8 @@ public:
     QAudioDeviceInfo getActiveAudioDevice(QAudio::Mode mode) const;
     QList<QAudioDeviceInfo> getAudioDevices(QAudio::Mode mode) const;
 
+    void enablePeakValues(bool enable) { _enablePeakValues = enable; }
+
     static const float CALLBACK_ACCELERATOR_RATIO;
 
     bool getNamedAudioDeviceForModeExists(QAudio::Mode mode, const QString& deviceName);
@@ -220,6 +222,7 @@ signals:
 
     void deviceChanged(QAudio::Mode mode, const QAudioDeviceInfo& device);
     void devicesChanged(QAudio::Mode mode, const QList<QAudioDeviceInfo>& devices);
+    void peakValueListChanged(const QList<float> peakValueList);
 
     void receivedFirstPacket();
     void disconnected();
@@ -238,9 +241,12 @@ private:
     friend class CheckDevicesThread;
     friend class LocalInjectorsThread;
 
+    // background tasks
+    void checkDevices();
+    void checkPeakValues();
+
     void outputFormatChanged();
     void handleAudioInput(QByteArray& audioBuffer);
-    void checkDevices();
     void prepareLocalAudioInjectors(std::unique_ptr<Lock> localAudioLock = nullptr);
     bool mixLocalAudioInjectors(float* mixBuffer);
     float azimuthForSource(const glm::vec3& relativePosition);
@@ -293,6 +299,7 @@ private:
     std::atomic<bool> _localInjectorsAvailable { false };
     MixedProcessedAudioStream _receivedAudioStream;
     bool _isStereoInput;
+    std::atomic<bool> _enablePeakValues { false };
 
     quint64 _outputStarveDetectionStartTimeMsec;
     int _outputStarveDetectionCount;
@@ -391,6 +398,7 @@ private:
     RateCounter<> _audioInbound;
 
     QTimer* _checkDevicesTimer { nullptr };
+    QTimer* _checkPeakValuesTimer { nullptr };
 };
 
 
diff --git a/libraries/audio-client/src/AudioPeakValues.cpp b/libraries/audio-client/src/AudioPeakValues.cpp
new file mode 100644
index 0000000000..021f23b907
--- /dev/null
+++ b/libraries/audio-client/src/AudioPeakValues.cpp
@@ -0,0 +1,16 @@
+//
+//  AudioPeakValues.cpp
+//  interface/src
+//
+//  Created by Zach Pomerantz on 6/26/2017
+//  Copyright 2013 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
+//
+
+#include "AudioClient.h"
+
+void AudioClient::checkPeakValues() {
+    // TODO
+}

From 3f57e5eb4d9cc145915948b2c91860c994cac344 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Tue, 27 Jun 2017 14:04:52 -0400
Subject: [PATCH 02/78] implement peakValueListChanged

---
 libraries/audio-client/src/AudioClient.cpp    |  10 +-
 libraries/audio-client/src/AudioClient.h      |   1 +
 .../audio-client/src/AudioPeakValues.cpp      | 164 +++++++++++++++++-
 3 files changed, 169 insertions(+), 6 deletions(-)

diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 7a1d8edccd..7f872443be 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -77,7 +77,7 @@ Setting::Handle<int> staticJitterBufferFrames("staticJitterBufferFrames",
 // protect the Qt internal device list
 using Mutex = std::mutex;
 using Lock = std::unique_lock<Mutex>;
-static Mutex _deviceMutex;
+Mutex _deviceMutex;
 
 // thread-safe
 QList<QAudioDeviceInfo> getAvailableDevices(QAudio::Mode mode) {
@@ -235,7 +235,7 @@ AudioClient::AudioClient() :
         QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkPeakValues(); });
     });
     const unsigned long PEAK_VALUES_CHECK_INTERVAL_SECS = 50;
-
+    _checkPeakValuesTimer->start(PEAK_VALUES_CHECK_INTERVAL_SECS);
 
     configureReverb();
 
@@ -308,8 +308,6 @@ QString getWinDeviceName(IMMDevice* pEndpoint) {
     QString deviceName;
     IPropertyStore* pPropertyStore;
     pEndpoint->OpenPropertyStore(STGM_READ, &pPropertyStore);
-    pEndpoint->Release();
-    pEndpoint = nullptr;
     PROPVARIANT pv;
     PropVariantInit(&pv);
     HRESULT hr = pPropertyStore->GetValue(PKEY_Device_FriendlyName, &pv);
@@ -338,6 +336,8 @@ QString AudioClient::getWinDeviceName(wchar_t* guid) {
         deviceName = QString("NONE");
     } else {
         deviceName = ::getWinDeviceName(pEndpoint);
+        pEndpoint->Release();
+        pEndpoint = nullptr;
     }
     pMMDeviceEnumerator->Release();
     pMMDeviceEnumerator = nullptr;
@@ -421,6 +421,8 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
             deviceName = QString("NONE");
         } else {
             deviceName = getWinDeviceName(pEndpoint);
+            pEndpoint->Release();
+            pEndpoint = nullptr;
         }
         pMMDeviceEnumerator->Release();
         pMMDeviceEnumerator = NULL;
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index 79e82526c6..63b1398d09 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -149,6 +149,7 @@ public:
     QList<QAudioDeviceInfo> getAudioDevices(QAudio::Mode mode) const;
 
     void enablePeakValues(bool enable) { _enablePeakValues = enable; }
+    bool peakValuesAvailable() const;
 
     static const float CALLBACK_ACCELERATOR_RATIO;
 
diff --git a/libraries/audio-client/src/AudioPeakValues.cpp b/libraries/audio-client/src/AudioPeakValues.cpp
index 021f23b907..3df469b830 100644
--- a/libraries/audio-client/src/AudioPeakValues.cpp
+++ b/libraries/audio-client/src/AudioPeakValues.cpp
@@ -11,6 +11,166 @@
 
 #include "AudioClient.h"
 
-void AudioClient::checkPeakValues() {
-    // TODO
+#ifdef Q_OS_WIN
+
+#include <windows.h>
+#include <mmdeviceapi.h>
+#include <endpointvolume.h>
+#include <audioclient.h>
+
+#include <QString>
+
+#define RETURN_ON_FAIL(result) if (FAILED(result)) { return; }
+#define CONTINUE_ON_FAIL(result) if (FAILED(result)) { continue; }
+
+extern QString getWinDeviceName(IMMDevice* pEndpoint);
+extern std::mutex _deviceMutex;
+
+std::map<std::wstring, std::shared_ptr<IAudioClient>> activeClients;
+
+template <class T>
+void release(T* t) {
+    t->Release();
 }
+
+template <>
+void release(IAudioClient* audioClient) {
+    audioClient->Stop();
+    audioClient->Release();
+}
+
+void AudioClient::checkPeakValues() {
+    // prepare the windows environment
+    CoInitialize(NULL);
+
+    // if disabled, clean up active clients
+    if (!_enablePeakValues) {
+        activeClients.clear();
+        return;
+    }
+
+    // lock the devices so the _inputDevices list is static
+    std::unique_lock<std::mutex> lock(_deviceMutex);
+    HRESULT result;
+
+    // initialize the payload
+    QList<float> peakValueList;
+    for (int i = 0; i < _inputDevices.size(); ++i) {
+        peakValueList.push_back(0.0f);
+    }
+
+    std::shared_ptr<IMMDeviceEnumerator> enumerator;
+    {
+        IMMDeviceEnumerator* pEnumerator;
+        result = CoCreateInstance(
+            __uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER,
+            __uuidof(IMMDeviceEnumerator), (void**)&pEnumerator);
+        RETURN_ON_FAIL(result);
+        enumerator = std::shared_ptr<IMMDeviceEnumerator>(pEnumerator, &release<IMMDeviceEnumerator>);
+    }
+
+    std::shared_ptr<IMMDeviceCollection> endpoints;
+    {
+        IMMDeviceCollection* pEndpoints;
+        result = enumerator->EnumAudioEndpoints(eCapture, DEVICE_STATE_ACTIVE, &pEndpoints);
+        RETURN_ON_FAIL(result);
+        endpoints = std::shared_ptr<IMMDeviceCollection>(pEndpoints, &release<IMMDeviceCollection>);
+    }
+
+    UINT count;
+    {
+        result = endpoints->GetCount(&count);
+        RETURN_ON_FAIL(result);
+    }
+
+    IMMDevice* pDevice;
+    std::shared_ptr<IMMDevice> device;
+    IAudioMeterInformation* pMeterInfo;
+    std::shared_ptr<IAudioMeterInformation> meterInfo;
+    IAudioClient* pAudioClient;
+    std::shared_ptr<IAudioClient> audioClient;
+    DWORD hardwareSupport;
+    LPWSTR pDeviceId = NULL;
+    LPWAVEFORMATEX format;
+    float peakValue;
+    QString deviceName;
+    int deviceIndex;
+    for (UINT i = 0; i < count; ++i) {
+        result = endpoints->Item(i, &pDevice);
+        CONTINUE_ON_FAIL(result);
+        device = std::shared_ptr<IMMDevice>(pDevice, &release<IMMDevice>);
+
+        // if the device isn't listed through Qt, skip it
+        deviceName = ::getWinDeviceName(pDevice);
+        deviceIndex = 0;
+        for (;  deviceIndex < _inputDevices.size(); ++deviceIndex) {
+            if (deviceName == _inputDevices[deviceIndex].deviceName()) {
+                break;
+            }
+        }
+        if (deviceIndex >= _inputDevices.size()) {
+            continue;
+        }
+
+        //continue;
+
+        result = device->Activate(__uuidof(IAudioMeterInformation), CLSCTX_ALL, NULL, (void**)&pMeterInfo);
+        CONTINUE_ON_FAIL(result);
+        meterInfo = std::shared_ptr<IAudioMeterInformation>(pMeterInfo, &release<IAudioMeterInformation>);
+
+        //continue;
+
+        hardwareSupport;
+        result = meterInfo->QueryHardwareSupport(&hardwareSupport);
+        CONTINUE_ON_FAIL(result);
+
+        //continue;
+
+        // if the device has no hardware support (USB)...
+        if (!(hardwareSupport & ENDPOINT_HARDWARE_SUPPORT_METER)) {
+            result = device->GetId(&pDeviceId);
+            CONTINUE_ON_FAIL(result);
+            std::wstring deviceId(pDeviceId);
+            CoTaskMemFree(pDeviceId);
+
+            //continue;
+
+            // ...and no active client...
+            if (activeClients.find(deviceId) == activeClients.end()) {
+                result = device->Activate(__uuidof(IAudioClient), CLSCTX_ALL, NULL, (void**)&pAudioClient);
+                CONTINUE_ON_FAIL(result);
+                audioClient = std::shared_ptr<IAudioClient>(pAudioClient, &release<IAudioClient>);
+
+                //continue;
+
+                // ...activate a client
+                audioClient->GetMixFormat(&format);
+                audioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, 0, 0, format, NULL);
+                audioClient->Start();
+
+                //continue;
+
+                activeClients[deviceId] = audioClient;
+            }
+        }
+
+        // get the peak value and put it in the payload
+        meterInfo->GetPeakValue(&peakValue);
+        peakValueList[deviceIndex] = peakValue;
+    }
+
+    emit peakValueListChanged(peakValueList);
+}
+
+bool AudioClient::peakValuesAvailable() const {
+    return true;
+}
+
+#else
+void AudioClient::checkPeakValues() {
+}
+
+bool AudioClient::peakValuesAvailable() const {
+    return false;
+}
+#endif
\ No newline at end of file

From 5353437f5915b9c88ab276a81dfdd95276a8df8d Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Tue, 27 Jun 2017 17:37:13 -0400
Subject: [PATCH 03/78] add peakValues to scripting API

---
 interface/src/scripting/AudioDevices.cpp | 82 ++++++++++++++++++------
 interface/src/scripting/AudioDevices.h   | 63 +++++++++++++++---
 2 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/interface/src/scripting/AudioDevices.cpp b/interface/src/scripting/AudioDevices.cpp
index b0ea8226e8..1c31d7aa5a 100644
--- a/interface/src/scripting/AudioDevices.cpp
+++ b/interface/src/scripting/AudioDevices.cpp
@@ -34,28 +34,44 @@ Setting::Handle<QString>& getSetting(bool contextIsHMD, QAudio::Mode mode) {
     }
 }
 
-QHash<int, QByteArray> AudioDeviceList::_roles {
-    { Qt::DisplayRole, "display" },
-    { Qt::CheckStateRole, "selected" }
+enum AudioDeviceRole {
+    DisplayRole = Qt::DisplayRole,
+    CheckStateRole = Qt::CheckStateRole,
+    PeakRole = Qt::UserRole
 };
+
+QHash<int, QByteArray> AudioDeviceList::_roles {
+    { DisplayRole, "display" },
+    { CheckStateRole, "selected" },
+    { PeakRole, "peak" }
+};
+
 Qt::ItemFlags AudioDeviceList::_flags { Qt::ItemIsSelectable | Qt::ItemIsEnabled };
 
 QVariant AudioDeviceList::data(const QModelIndex& index, int role) const {
-    if (!index.isValid() || index.row() >= _devices.size()) {
+    if (!index.isValid() || index.row() >= rowCount()) {
         return QVariant();
     }
 
-    if (role == Qt::DisplayRole) {
-        return _devices.at(index.row()).display;
-    } else if (role == Qt::CheckStateRole) {
-        return _devices.at(index.row()).selected;
+    if (role == DisplayRole) {
+        return _devices.at(index.row())->display;
+    } else if (role == CheckStateRole) {
+        return _devices.at(index.row())->selected;
     } else {
         return QVariant();
     }
 }
 
+QVariant AudioInputDeviceList::data(const QModelIndex& index, int role) const {
+    if (index.isValid() && index.row() < rowCount() && role == PeakRole) {
+        return std::static_pointer_cast<AudioInputDevice>(_devices.at(index.row()))->peak;
+    } else {
+        return AudioDeviceList::data(index, role);
+    }
+}
+
 bool AudioDeviceList::setData(const QModelIndex& index, const QVariant& value, int role) {
-    if (!index.isValid() || index.row() >= _devices.size() || role != Qt::CheckStateRole) {
+	if (!index.isValid() || index.row() >= rowCount() || role != CheckStateRole) {
         return false;
     }
 
@@ -73,19 +89,19 @@ bool AudioDeviceList::setDevice(int row, bool fromUser) {
     auto& device = _devices[row];
 
     // skip if already selected
-    if (!device.selected) {
+    if (!device->selected) {
         auto client = DependencyManager::get<AudioClient>();
         QMetaObject::invokeMethod(client.data(), "switchAudioDevice", Qt::BlockingQueuedConnection,
             Q_RETURN_ARG(bool, success),
             Q_ARG(QAudio::Mode, _mode),
-            Q_ARG(const QAudioDeviceInfo&, device.info));
+            Q_ARG(const QAudioDeviceInfo&, device->info));
 
         if (success) {
-            device.selected = true;
+            device->selected = true;
             if (fromUser) {
-                emit deviceSelected(device.info, _selectedDevice);
+                emit deviceSelected(device->info, _selectedDevice);
             }
-            emit deviceChanged(device.info);
+            emit deviceChanged(device->info);
         }
     }
 
@@ -100,7 +116,7 @@ void AudioDeviceList::resetDevice(bool contextIsHMD, const QString& device) {
     if (!device.isNull()) {
         auto i = 0;
         for (; i < rowCount(); ++i) {
-            if (device == _devices[i].info.deviceName()) {
+            if (device == _devices[i]->info.deviceName()) {
                 break;
             }
         }
@@ -138,8 +154,8 @@ void AudioDeviceList::onDeviceChanged(const QAudioDeviceInfo& device) {
     _selectedDevice = device;
     QModelIndex index;
 
-    for (auto i = 0; i < _devices.size(); ++i) {
-        AudioDevice& device = _devices[i];
+    for (auto i = 0; i < rowCount(); ++i) {
+        AudioDevice& device = *_devices[i];
 
         if (device.selected && device.info != _selectedDevice) {
             device.selected = false;
@@ -166,17 +182,47 @@ void AudioDeviceList::onDevicesChanged(const QList<QAudioDeviceInfo>& devices) {
             .remove("Device")
             .replace(" )", ")");
         device.selected = (device.info == _selectedDevice);
-        _devices.push_back(device);
+        _devices.push_back(newDevice(device));
     }
 
     endResetModel();
 }
 
+bool AudioInputDeviceList::peakValuesAvailable() {
+    std::call_once(_peakFlag, [&] {
+        _peakValuesAvailable = DependencyManager::get<AudioClient>()->peakValuesAvailable();
+    });
+    return _peakValuesAvailable;
+}
+
+void AudioInputDeviceList::setPeakValuesEnabled(bool enable) {
+    if (peakValuesAvailable() && (enable != _peakValuesEnabled)) {
+        DependencyManager::get<AudioClient>()->enablePeakValues(enable);
+        _peakValuesEnabled = enable;
+        emit peakValuesEnabledChanged(_peakValuesEnabled);
+    }
+}
+
+void AudioInputDeviceList::onPeakValueListChanged(const QList<float>& peakValueList) {
+    assert(_mode == QAudio::AudioInput);
+
+    if (peakValueList.length() != rowCount()) {
+        qWarning() << "AudioDeviceList" << __FUNCTION__ << "length mismatch";
+    }
+
+    for (auto i = 0; i < rowCount(); ++i) {
+        std::static_pointer_cast<AudioInputDevice>(_devices[i])->peak = peakValueList[i];
+    }
+
+    emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, 0), { PeakRole });
+}
+
 AudioDevices::AudioDevices(bool& contextIsHMD) : _contextIsHMD(contextIsHMD) {
     auto client = DependencyManager::get<AudioClient>();
 
     connect(client.data(), &AudioClient::deviceChanged, this, &AudioDevices::onDeviceChanged, Qt::QueuedConnection);
     connect(client.data(), &AudioClient::devicesChanged, this, &AudioDevices::onDevicesChanged, Qt::QueuedConnection);
+    connect(client.data(), &AudioClient::peakValueListChanged, &_inputs, &AudioInputDeviceList::onPeakValueListChanged, Qt::QueuedConnection);
 
     // connections are made after client is initialized, so we must also fetch the devices
     _inputs.onDeviceChanged(client->getActiveAudioDevice(QAudio::AudioInput));
diff --git a/interface/src/scripting/AudioDevices.h b/interface/src/scripting/AudioDevices.h
index cd47ab4191..bdf03820f4 100644
--- a/interface/src/scripting/AudioDevices.h
+++ b/interface/src/scripting/AudioDevices.h
@@ -12,6 +12,9 @@
 #ifndef hifi_scripting_AudioDevices_h
 #define hifi_scripting_AudioDevices_h
 
+#include <memory>
+#include <mutex>
+
 #include <QObject>
 #include <QAbstractListModel>
 #include <QAudioDeviceInfo>
@@ -29,7 +32,11 @@ class AudioDeviceList : public QAbstractListModel {
     Q_OBJECT
 
 public:
-    AudioDeviceList(QAudio::Mode mode) : _mode(mode) {}
+    AudioDeviceList(QAudio::Mode mode = QAudio::AudioOutput) : _mode(mode) {}
+    ~AudioDeviceList() = default;
+
+    virtual std::shared_ptr<AudioDevice> newDevice(const AudioDevice& device)
+        { return std::make_shared<AudioDevice>(device); }
 
     int rowCount(const QModelIndex& parent = QModelIndex()) const override { Q_UNUSED(parent); return _devices.size(); }
     QHash<int, QByteArray> roleNames() const override { return _roles; }
@@ -47,11 +54,11 @@ signals:
                         const QAudioDeviceInfo& previousDevice = QAudioDeviceInfo());
     void deviceChanged(const QAudioDeviceInfo& device);
 
-private slots:
+protected slots:
     void onDeviceChanged(const QAudioDeviceInfo& device);
     void onDevicesChanged(const QList<QAudioDeviceInfo>& devices);
 
-private:
+protected:
     friend class AudioDevices;
 
     bool setDevice(int index, bool fromUser);
@@ -59,16 +66,54 @@ private:
     static QHash<int, QByteArray> _roles;
     static Qt::ItemFlags _flags;
 
-    QAudio::Mode _mode;
+    QAudio::Mode _mode { QAudio::AudioOutput };
     QAudioDeviceInfo _selectedDevice;
-    QList<AudioDevice> _devices;
+    QList<std::shared_ptr<AudioDevice>> _devices;
+};
+
+class AudioInputDevice : public AudioDevice {
+public:
+    AudioInputDevice(const AudioDevice& device) : AudioDevice(device) {}
+    float peak { 0.0f };
+};
+
+class AudioInputDeviceList : public AudioDeviceList {
+    Q_OBJECT
+    Q_PROPERTY(bool peakValuesAvailable READ peakValuesAvailable)
+    Q_PROPERTY(bool peakValuesEnabled READ peakValuesEnabled WRITE setPeakValuesEnabled NOTIFY peakValuesEnabledChanged)
+
+public:
+    AudioInputDeviceList() : AudioDeviceList(QAudio::AudioInput) {}
+    virtual ~AudioInputDeviceList() = default;
+
+    virtual std::shared_ptr<AudioDevice> newDevice(const AudioDevice& device)
+        { return std::make_shared<AudioInputDevice>(device); }
+
+    QVariant data(const QModelIndex& index, int role) const override;
+
+signals:
+    void peakValuesEnabledChanged(bool enabled);
+
+protected slots:
+    void onPeakValueListChanged(const QList<float>& peakValueList);
+
+protected:
+    friend class AudioDevices;
+
+    bool peakValuesAvailable();
+    std::once_flag _peakFlag;
+    bool _peakValuesAvailable;
+
+    bool peakValuesEnabled() const { return _peakValuesEnabled; }
+    void setPeakValuesEnabled(bool enable);
+    bool _peakValuesEnabled { false };
 };
 
 class Audio;
 
 class AudioDevices : public QObject {
     Q_OBJECT
-    Q_PROPERTY(AudioDeviceList* input READ getInputList NOTIFY nop)
+    Q_PROPERTY(AudioInputDeviceList* input READ getInputList NOTIFY nop)
     Q_PROPERTY(AudioDeviceList* output READ getOutputList NOTIFY nop)
 
 public:
@@ -86,11 +131,11 @@ private slots:
 private:
     friend class Audio;
 
-    AudioDeviceList* getInputList() { return &_inputs; }
+    AudioInputDeviceList* getInputList() { return &_inputs; }
     AudioDeviceList* getOutputList() { return &_outputs; }
 
-    AudioDeviceList _inputs { QAudio::AudioInput };
-    AudioDeviceList _outputs { QAudio::AudioOutput };
+    AudioInputDeviceList _inputs;
+    AudioDeviceList _outputs;
 
     bool& _contextIsHMD;
 };

From 9b72ab96ff5a019d20b7a030a48c20af1bf84023 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Tue, 27 Jun 2017 17:37:24 -0400
Subject: [PATCH 04/78] add peak values to qml

---
 interface/resources/qml/hifi/audio/Audio.qml  | 26 ++++++++++++++++---
 .../audio/{InputLevel.qml => InputPeak.qml}   |  6 ++---
 2 files changed, 25 insertions(+), 7 deletions(-)
 rename interface/resources/qml/hifi/audio/{InputLevel.qml => InputPeak.qml} (95%)

diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index c13bd3281a..9ebde8b61f 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -36,6 +36,23 @@ Rectangle {
         return root.parent.objectName == "loader";
     }
 
+    property bool showPeaks: true;
+    function enablePeakValues() {
+        Audio.devices.input.peakValuesEnabled = true;
+        Audio.devices.input.peakValuesEnabledChanged.connect(function(enabled) {
+            if (!enabled && root.showPeaks) {
+                Audio.devices.input.peakValuesEnabled = true;
+            }
+        });
+    }
+    function disablePeakValues() {
+        root.showPeaks = false;
+        Audio.devices.input.peakValuesEnabled = false;
+    }
+
+    Component.onCompleted: enablePeakValues();
+    Component.onDestruction: disablePeakValues();
+
     Column {
         y: 16; // padding does not work
         spacing: 16;
@@ -122,7 +139,7 @@ Rectangle {
                     width: parent.width;
 
                     AudioControls.CheckBox {
-                        Layout.maximumWidth: parent.width - level.width - 40;
+                        Layout.maximumWidth: parent.width - inputPeak.width - 40;
                         text: display;
                         wrap: false;
                         checked: selected;
@@ -131,11 +148,12 @@ Rectangle {
                             checked = Qt.binding(function() { return selected; }); // restore binding
                         }
                     }
-                    InputLevel {
-                        id: level;
+                    InputPeak {
+                        id: inputPeak;
+                        visible: Audio.devices.input.peakValuesAvailable;
+                        peak: model.peak;
                         Layout.alignment: Qt.AlignRight;
                         Layout.rightMargin: 30;
-                        visible: selected;
                     }
                 }
             }
diff --git a/interface/resources/qml/hifi/audio/InputLevel.qml b/interface/resources/qml/hifi/audio/InputPeak.qml
similarity index 95%
rename from interface/resources/qml/hifi/audio/InputLevel.qml
rename to interface/resources/qml/hifi/audio/InputPeak.qml
index 58ce3a1ec7..4ff49091b1 100644
--- a/interface/resources/qml/hifi/audio/InputLevel.qml
+++ b/interface/resources/qml/hifi/audio/InputPeak.qml
@@ -1,5 +1,5 @@
 //
-//  InputLevel.qml
+//  InputPeak.qml
 //  qml/hifi/audio
 //
 //  Created by Zach Pomerantz on 6/20/2017
@@ -15,7 +15,7 @@ import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 
 Rectangle {
-    readonly property var level: Audio.inputLevel;
+    property var peak;
 
     width: 70;
     height: 8;
@@ -65,7 +65,7 @@ Rectangle {
 
         Rectangle { // mask
             id: mask;
-            width: parent.width * level;
+            width: parent.width * peak;
             radius: 5;
             anchors {
                 bottom: parent.bottom;

From ed49f80322377e7d5e40f4229889eed13345504f Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Thu, 29 Jun 2017 17:32:52 -0400
Subject: [PATCH 05/78] fix peak check secs->msecs

---
 libraries/audio-client/src/AudioClient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 7f872443be..88f34d60f1 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -234,8 +234,8 @@ AudioClient::AudioClient() :
     connect(_checkPeakValuesTimer, &QTimer::timeout, [this] {
         QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkPeakValues(); });
     });
-    const unsigned long PEAK_VALUES_CHECK_INTERVAL_SECS = 50;
-    _checkPeakValuesTimer->start(PEAK_VALUES_CHECK_INTERVAL_SECS);
+    const unsigned long PEAK_VALUES_CHECK_INTERVAL_MSECS = 50;
+    _checkPeakValuesTimer->start(PEAK_VALUES_CHECK_INTERVAL_MSECS);
 
     configureReverb();
 

From 631e5a7b0433c100b457428a6e53bc0cf9ac575a Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Thu, 29 Jun 2017 17:34:01 -0400
Subject: [PATCH 06/78] add override to AudioInputDeviceList::newDevice

---
 interface/src/scripting/AudioDevices.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/scripting/AudioDevices.h b/interface/src/scripting/AudioDevices.h
index bdf03820f4..60d547f58f 100644
--- a/interface/src/scripting/AudioDevices.h
+++ b/interface/src/scripting/AudioDevices.h
@@ -86,7 +86,7 @@ public:
     AudioInputDeviceList() : AudioDeviceList(QAudio::AudioInput) {}
     virtual ~AudioInputDeviceList() = default;
 
-    virtual std::shared_ptr<AudioDevice> newDevice(const AudioDevice& device)
+    virtual std::shared_ptr<AudioDevice> newDevice(const AudioDevice& device) override
         { return std::make_shared<AudioInputDevice>(device); }
 
     QVariant data(const QModelIndex& index, int role) const override;

From 0da19af6f32c274f42a0fc08b18a6bb2cb220280 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Tue, 11 Jul 2017 10:06:38 -0700
Subject: [PATCH 07/78] Stop all capture devices when Audio.qml is not visible.
 Otherwise, Windows will continue to capture audio from all attached devices
 (possibly causing mic audio glitches) until Interface shutdown.

---
 interface/resources/qml/hifi/audio/Audio.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index aea0f0501d..4e0b4cebe2 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -52,6 +52,7 @@ Rectangle {
 
     Component.onCompleted: enablePeakValues();
     Component.onDestruction: disablePeakValues();
+    onVisibleChanged: visible ? enablePeakValues() : disablePeakValues();
 
     Column {
         y: 16; // padding does not work

From 50deee1d38fd9f66d94bd8b3731f29342e43b411 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Wed, 12 Jul 2017 12:29:25 -0700
Subject: [PATCH 08/78] Replace tabs with spaces

---
 interface/src/scripting/AudioDevices.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/scripting/AudioDevices.cpp b/interface/src/scripting/AudioDevices.cpp
index 574ec00ad6..c3958f2ad9 100644
--- a/interface/src/scripting/AudioDevices.cpp
+++ b/interface/src/scripting/AudioDevices.cpp
@@ -73,7 +73,7 @@ QVariant AudioInputDeviceList::data(const QModelIndex& index, int role) const {
 }
 
 bool AudioDeviceList::setData(const QModelIndex& index, const QVariant& value, int role) {
-	if (!index.isValid() || index.row() >= rowCount() || role != CheckStateRole) {
+    if (!index.isValid() || index.row() >= rowCount() || role != CheckStateRole) {
         return false;
     }
 

From cf6c1ae4a54391d4d096c5e76805534fbfc60f31 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Wed, 12 Jul 2017 12:30:02 -0700
Subject: [PATCH 09/78] Replace tabs with spaces

---
 assignment-client/src/audio/AudioMixerSlave.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp
index ed63bbc298..a131e266d2 100644
--- a/assignment-client/src/audio/AudioMixerSlave.cpp
+++ b/assignment-client/src/audio/AudioMixerSlave.cpp
@@ -558,7 +558,7 @@ float computeAzimuth(const AvatarAudioStream& listeningNodeStream, const Positio
         
         // produce an oriented angle about the y-axis
         glm::vec3 direction = rotatedSourcePosition * (1.0f / fastSqrtf(rotatedSourcePositionLength2));
-		float angle = fastAcosf(glm::clamp(-direction.z, -1.0f, 1.0f)); // UNIT_NEG_Z is "forward"
+        float angle = fastAcosf(glm::clamp(-direction.z, -1.0f, 1.0f)); // UNIT_NEG_Z is "forward"
         return (direction.x < 0.0f) ? -angle : angle;
 
     } else {   

From 93ad1b6cbf8c1f3fe1a979ef21d8419b5a634f08 Mon Sep 17 00:00:00 2001
From: Mohammed Nafees <nafees.technocool@gmail.com>
Date: Thu, 3 Aug 2017 01:53:26 +0530
Subject: [PATCH 10/78] Add link in help page to report a problem

---
 interface/resources/html/tabletHelp.html | 27 +++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/interface/resources/html/tabletHelp.html b/interface/resources/html/tabletHelp.html
index cbd7ffcfe7..a6588be083 100644
--- a/interface/resources/html/tabletHelp.html
+++ b/interface/resources/html/tabletHelp.html
@@ -6,7 +6,14 @@
         <title>Welcome to Interface</title>
 
         <style>
-          body {
+            @font-face {
+                font-family: 'Raleway Light';
+                src: url('../fonts/Raleway-Light.ttf') format('truetype');
+                font-weight: normal;
+                font-style: normal;
+            }
+
+            body {
                 background: black;
                 width: 100%;
                 overflow-x: hidden;
@@ -15,6 +22,14 @@
                 padding: 0;
             }
 
+            a:link {color:inherit}
+            a:active {color:inherit}
+            a:visited {color:inherit}
+            a:hover {
+                color:inherit;
+                cursor: pointer;
+            }
+
             #left_button {
                 position: absolute;
                 left: 70;
@@ -38,6 +53,15 @@
                 position: absolute;
                 top: 0; left: 0; bottom: 0; right: 0;
             }
+
+            #report_problem {
+                position: fixed;
+                top: 10;
+                right: 10;
+                font-family: "Raleway Light", sans-serif;
+                text-decoration: none;
+                color: #ddd;
+            }
         </style>
         <script>
             var handControllerImageURL = null;
@@ -152,6 +176,7 @@
             <a href="#" id="left_button" onmousedown="cycleLeft()"></a>
             <a href="#" id="right_button" onmousedown="cycleRight()"></a>
         </div>
+        <a href="mailto:support@highfidelity.com" id="report_problem">Report Problem</a>
     </body>
 
 </html>

From 1fc050fdef894751f9888ef97d1c30a4810ab729 Mon Sep 17 00:00:00 2001
From: Ken Cooke <ken@highfidelity.io>
Date: Mon, 7 Aug 2017 08:11:43 -0700
Subject: [PATCH 11/78] Fix _devices access via shared_ptr

---
 interface/src/scripting/AudioDevices.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/scripting/AudioDevices.cpp b/interface/src/scripting/AudioDevices.cpp
index c06f921a7f..e5cc43f9df 100644
--- a/interface/src/scripting/AudioDevices.cpp
+++ b/interface/src/scripting/AudioDevices.cpp
@@ -74,11 +74,11 @@ QVariant AudioDeviceList::data(const QModelIndex& index, int role) const {
     }
 
     if (role == DisplayRole) {
-        return _devices.at(index.row()).display;
+        return _devices.at(index.row())->display;
     } else if (role == CheckStateRole) {
-        return _devices.at(index.row()).selected;
+        return _devices.at(index.row())->selected;
     } else if (role == InfoRole) {
-        return QVariant::fromValue<QAudioDeviceInfo>(_devices.at(index.row()).info);
+        return QVariant::fromValue<QAudioDeviceInfo>(_devices.at(index.row())->info);
     } else {
         return QVariant();
     }
@@ -90,7 +90,7 @@ QVariant AudioInputDeviceList::data(const QModelIndex& index, int role) const {
     }
 
     if (role == PeakRole) {
-        return std::static_pointer_cast<AudioInputDevice>(_devices.at(index.row())).peak;
+        return std::static_pointer_cast<AudioInputDevice>(_devices.at(index.row()))->peak;
     } else {
         return AudioDeviceList::data(index, role);
     }

From e48c14ec23fc86bd1af759502430273190a2dedf Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@AD.HIGHFIDELITY.IO>
Date: Wed, 16 Aug 2017 09:08:55 -0700
Subject: [PATCH 12/78] fixed tablet spawn position for oculus menu button

---
 scripts/system/controllers/handControllerPointer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js
index eb94428100..23934eee00 100644
--- a/scripts/system/controllers/handControllerPointer.js
+++ b/scripts/system/controllers/handControllerPointer.js
@@ -451,7 +451,7 @@ clickMapping.from(Controller.Standard.Start).peek().to(function (clicked) {
     if (clicked) {
         activeHudPoint2dGamePad();
         var noHands = -1;
-        Messages.sendLocalMessage("toggleHand", noHands);
+        Messages.sendLocalMessage("toggleHand", Controller.Standard.LeftHand);
       }
 
       wantsMenu = clicked;

From 2e5e0c94f13ab3cfed9bd1583a17a003de2003d8 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Fri, 18 Aug 2017 15:34:15 +0200
Subject: [PATCH 13/78] Added login button to Tablet

---
 .../resources/qml/hifi/tablet/Tablet.qml      | 28 ++++++++++++++-----
 .../DialogsManagerScriptingInterface.cpp      |  7 ++++-
 .../DialogsManagerScriptingInterface.h        |  1 +
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index 43672190dd..521c3b2e14 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -109,15 +109,29 @@ Item {
             }
         }
 
-        RalewaySemiBold {
-            id: usernameText
-            text: tabletRoot.username
-            anchors.verticalCenter: parent.verticalCenter
+        Item {
+            width: 150
+            height: 50
             anchors.right: parent.right
             anchors.rightMargin: 20
-            horizontalAlignment: Text.AlignRight
-            font.pixelSize: 20
-            color: "#afafaf"
+            anchors.verticalCenter: parent.verticalCenter
+
+            RalewaySemiBold {
+                id: usernameText
+                text: Account.isLoggedIn() ? tabletRoot.username : qsTr("Log in")
+                anchors.verticalCenter: parent.verticalCenter
+                horizontalAlignment: Text.AlignRight
+                anchors.right: parent.right
+                font.pixelSize: 20
+                color: "#afafaf"
+            }
+            MouseArea {
+                anchors.fill: parent
+                enabled: !Account.isLoggedIn()
+                onClicked: {
+                    DialogsManager.showLoginDialog()
+                }
+            }
         }
     }
 
diff --git a/interface/src/scripting/DialogsManagerScriptingInterface.cpp b/interface/src/scripting/DialogsManagerScriptingInterface.cpp
index 0fb6078290..596320eb3c 100644
--- a/interface/src/scripting/DialogsManagerScriptingInterface.cpp
+++ b/interface/src/scripting/DialogsManagerScriptingInterface.cpp
@@ -33,7 +33,12 @@ void DialogsManagerScriptingInterface::showAddressBar() {
 
 void DialogsManagerScriptingInterface::hideAddressBar() {
     QMetaObject::invokeMethod(DependencyManager::get<DialogsManager>().data(),
-        "hideAddressBar", Qt::QueuedConnection);
+                              "hideAddressBar", Qt::QueuedConnection);
+}
+
+void DialogsManagerScriptingInterface::showLoginDialog() {
+    QMetaObject::invokeMethod(DependencyManager::get<DialogsManager>().data(),
+        "showLoginDialog", Qt::QueuedConnection);
 }
 
 void DialogsManagerScriptingInterface::showFeed() {
diff --git a/interface/src/scripting/DialogsManagerScriptingInterface.h b/interface/src/scripting/DialogsManagerScriptingInterface.h
index e4dd18aedf..b223799cfe 100644
--- a/interface/src/scripting/DialogsManagerScriptingInterface.h
+++ b/interface/src/scripting/DialogsManagerScriptingInterface.h
@@ -24,6 +24,7 @@ public:
 public slots:
     void showAddressBar();
     void hideAddressBar();
+    void showLoginDialog();
 
 signals:
     void addressBarShown(bool visible);

From 0de109e2e81b3d21ab110cc9001e50e9075a53b7 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 18 Aug 2017 11:29:47 -0700
Subject: [PATCH 14/78] cleanup and fix typos

---
 libraries/octree/src/Octree.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index cceecaeed9..cde2fe7026 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -431,7 +431,7 @@ int Octree::readElementData(const OctreeElementPointer& destinationElement, cons
     return bytesRead;
 }
 
-void Octree::readBitstreamToTree(const unsigned char * bitstream, unsigned long int bufferSizeBytes,
+void Octree::readBitstreamToTree(const unsigned char * bitstream, uint64_t bufferSizeBytes,
                                  ReadBitstreamToTreeParams& args) {
     int bytesRead = 0;
     const unsigned char* bitstreamAt = bitstream;
@@ -925,8 +925,8 @@ int Octree::encodeTreeBitstream(const OctreeElementPointer& element,
         roomForOctalCode = packetData->startSubTree(newCode);
 
         if (newCode) {
-            delete[] newCode;
             codeLength = numberOfThreeBitSectionsInCode(newCode);
+            delete[] newCode;
         } else {
             codeLength = 1;
         }
@@ -1152,7 +1152,6 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
     OctreeElementPointer sortedChildren[NUMBER_OF_CHILDREN] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
     float distancesToChildren[NUMBER_OF_CHILDREN] = { 0, 0, 0, 0, 0, 0, 0, 0 };
     int indexOfChildren[NUMBER_OF_CHILDREN] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-    int currentCount = 0;
 
     for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
         OctreeElementPointer childElement = element->getChildAtIndex(i);
@@ -1174,7 +1173,6 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
         sortedChildren[i] = childElement;
         indexOfChildren[i] = i;
         distancesToChildren[i] = 0.0f;
-        currentCount++;
 
         // track stats
         // must check childElement here, because it could be we got here with no childElement
@@ -1185,7 +1183,7 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
 
     // for each child element in Distance sorted order..., check to see if they exist, are colored, and in view, and if so
     // add them to our distance ordered array of children
-    for (int i = 0; i < currentCount; i++) {
+    for (int i = 0; i < NUMBER_OF_CHILDREN; i++) {
         OctreeElementPointer childElement = sortedChildren[i];
         int originalIndex = indexOfChildren[i];
 
@@ -1276,7 +1274,7 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
     }
 
     // NOTE: the childrenDataBits indicates that there is an array of child element data included in this packet.
-    // We wil write this bit mask but we may come back later and update the bits that are actually included
+    // We will write this bit mask but we may come back later and update the bits that are actually included
     packetData->releaseReservedBytes(sizeof(childrenDataBits));
     continueThisLevel = packetData->appendBitMask(childrenDataBits);
 
@@ -1441,7 +1439,7 @@ int Octree::encodeTreeBitstreamRecursion(const OctreeElementPointer& element,
 
         // for each child element in Distance sorted order..., check to see if they exist, are colored, and in view, and if so
         // add them to our distance ordered array of children
-        for (int indexByDistance = 0; indexByDistance < currentCount; indexByDistance++) {
+        for (int indexByDistance = 0; indexByDistance < NUMBER_OF_CHILDREN; indexByDistance++) {
             OctreeElementPointer childElement = sortedChildren[indexByDistance];
             int originalIndex = indexOfChildren[indexByDistance];
 

From 075b8574fb34f3ecee744691c8512555b2c63de5 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 18 Aug 2017 11:31:03 -0700
Subject: [PATCH 15/78] using 0.0 for time stats is unambiguous

---
 assignment-client/src/octree/OctreeServer.cpp | 17 +++++------------
 assignment-client/src/octree/OctreeServer.h   |  2 --
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index db97da751f..227f9599e3 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -37,8 +37,6 @@
 int OctreeServer::_clientCount = 0;
 const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000000;
 
-float OctreeServer::SKIP_TIME = -1.0f; // use this for trackXXXTime() calls for non-times
-
 SimpleMovingAverage OctreeServer::_averageLoopTime(MOVING_AVERAGE_SAMPLE_COUNTS);
 SimpleMovingAverage OctreeServer::_averageInsideTime(MOVING_AVERAGE_SAMPLE_COUNTS);
 
@@ -134,9 +132,8 @@ void OctreeServer::trackEncodeTime(float time) {
     const float MAX_SHORT_TIME = 10.0f;
     const float MAX_LONG_TIME = 100.0f;
 
-    if (time == SKIP_TIME) {
+    if (time == 0.0f) {
         _noEncode++;
-        time = 0.0f;
     } else if (time <= MAX_SHORT_TIME) {
         _shortEncode++;
         _averageShortEncodeTime.updateAverage(time);
@@ -153,9 +150,8 @@ void OctreeServer::trackEncodeTime(float time) {
 void OctreeServer::trackTreeWaitTime(float time) {
     const float MAX_SHORT_TIME = 10.0f;
     const float MAX_LONG_TIME = 100.0f;
-    if (time == SKIP_TIME) {
+    if (time == 0.0f) {
         _noTreeWait++;
-        time = 0.0f;
     } else if (time <= MAX_SHORT_TIME) {
         _shortTreeWait++;
         _averageTreeShortWaitTime.updateAverage(time);
@@ -172,9 +168,8 @@ void OctreeServer::trackTreeWaitTime(float time) {
 void OctreeServer::trackCompressAndWriteTime(float time) {
     const float MAX_SHORT_TIME = 10.0f;
     const float MAX_LONG_TIME = 100.0f;
-    if (time == SKIP_TIME) {
+    if (time == 0.0f) {
         _noCompress++;
-        time = 0.0f;
     } else if (time <= MAX_SHORT_TIME) {
         _shortCompress++;
         _averageShortCompressTime.updateAverage(time);
@@ -189,9 +184,8 @@ void OctreeServer::trackCompressAndWriteTime(float time) {
 }
 
 void OctreeServer::trackPacketSendingTime(float time) {
-    if (time == SKIP_TIME) {
+    if (time == 0.0f) {
         _noSend++;
-        time = 0.0f;
     }
     _averagePacketSendingTime.updateAverage(time);
 }
@@ -200,9 +194,8 @@ void OctreeServer::trackPacketSendingTime(float time) {
 void OctreeServer::trackProcessWaitTime(float time) {
     const float MAX_SHORT_TIME = 10.0f;
     const float MAX_LONG_TIME = 100.0f;
-    if (time == SKIP_TIME) {
+    if (time == 0.0f) {
         _noProcessWait++;
-        time = 0.0f;
     } else if (time <= MAX_SHORT_TIME) {
         _shortProcessWait++;
         _averageProcessShortWaitTime.updateAverage(time);
diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h
index 5043ea681c..ab2ef30da1 100644
--- a/assignment-client/src/octree/OctreeServer.h
+++ b/assignment-client/src/octree/OctreeServer.h
@@ -82,8 +82,6 @@ public:
     virtual void trackSend(const QUuid& dataID, quint64 dataLastEdited, const QUuid& viewerNode) { }
     virtual void trackViewerGone(const QUuid& viewerNode) { }
 
-    static float SKIP_TIME; // use this for trackXXXTime() calls for non-times
-
     static void trackLoopTime(float time) { _averageLoopTime.updateAverage(time); }
     static float getAverageLoopTime() { return _averageLoopTime.getAverage(); }
 

From 65cf7b4f61fe8df7c514d4b0e96176d84e9b503f Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 18 Aug 2017 11:32:05 -0700
Subject: [PATCH 16/78] add OctreeSendThread::traverseAndBuildPacket()

cleanup and split data packing from bandwidth management
---
 .../src/octree/OctreeSendThread.cpp           | 130 ++++++++----------
 .../src/octree/OctreeSendThread.h             |   4 +-
 2 files changed, 64 insertions(+), 70 deletions(-)

diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 868b377ced..5c4639a8e0 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -458,84 +458,77 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
     return _truePacketsSent;
 }
 
+bool OctreeSendThread::traverseAndBuildPacket(EncodeBitstreamParams& params) {
+    bool somethingToSend = false;
+    OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(params.nodeData);
+    if (!nodeData->elementBag.isEmpty()) {
+        quint64 encodeStart = usecTimestampNow();
+        quint64 lockWaitStart = encodeStart;
+
+        _myServer->getOctree()->withReadLock([&]{
+            OctreeServer::trackTreeWaitTime((float)(usecTimestampNow() - lockWaitStart));
+
+            OctreeElementPointer subTree = nodeData->elementBag.extract();
+            if (subTree) {
+                // NOTE: this is where the tree "contents" are actually packed
+                nodeData->stats.encodeStarted();
+                _myServer->getOctree()->encodeTreeBitstream(subTree, &_packetData, nodeData->elementBag, params);
+                nodeData->stats.encodeStopped();
+
+                somethingToSend = true;
+            }
+        });
+
+        OctreeServer::trackEncodeTime((float)(usecTimestampNow() - encodeStart));
+    }
+    return somethingToSend;
+}
+
 void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData, bool viewFrustumChanged, bool isFullScene) {
     // calculate max number of packets that can be sent during this interval
     int clientMaxPacketsPerInterval = std::max(1, (nodeData->getMaxQueryPacketsPerSecond() / INTERVALS_PER_SECOND));
     int maxPacketsPerInterval = std::min(clientMaxPacketsPerInterval, _myServer->getPacketsPerClientPerInterval());
 
     int extraPackingAttempts = 0;
-    bool completedScene = false;
+
+    // init params once outside the while loop
+    int boundaryLevelAdjustClient = nodeData->getBoundaryLevelAdjust();
+    int boundaryLevelAdjust = boundaryLevelAdjustClient +
+                            (viewFrustumChanged ? LOW_RES_MOVING_ADJUST : NO_BOUNDARY_ADJUST);
+    float octreeSizeScale = nodeData->getOctreeSizeScale();
+    EncodeBitstreamParams params(INT_MAX, WANT_EXISTS_BITS, DONT_CHOP,
+                                viewFrustumChanged, boundaryLevelAdjust, octreeSizeScale,
+                                isFullScene, _myServer->getJurisdiction(), nodeData);
+    // Our trackSend() function is implemented by the server subclass, and will be called back
+    // during the encodeTreeBitstream() as new entities/data elements are sent
+    params.trackSend = [this](const QUuid& dataID, quint64 dataEdited) {
+        _myServer->trackSend(dataID, dataEdited, _nodeUuid);
+    };
+    nodeData->copyCurrentViewFrustum(params.viewFrustum);
+    if (viewFrustumChanged) {
+        nodeData->copyLastKnownViewFrustum(params.lastViewFrustum);
+    }
 
     bool somethingToSend = true; // assume we have something
+    bool bagHadSomething = !nodeData->elementBag.isEmpty();
     while (somethingToSend && _packetsSentThisInterval < maxPacketsPerInterval && !nodeData->isShuttingDown()) {
-        float lockWaitElapsedUsec = OctreeServer::SKIP_TIME;
-        float encodeElapsedUsec = OctreeServer::SKIP_TIME;
-        float compressAndWriteElapsedUsec = OctreeServer::SKIP_TIME;
-        float packetSendingElapsedUsec = OctreeServer::SKIP_TIME;
+        float compressAndWriteElapsedUsec = 0.0f;
+        float packetSendingElapsedUsec = 0.0f;
 
         quint64 startInside = usecTimestampNow();
 
         bool lastNodeDidntFit = false; // assume each node fits
-        if (!nodeData->elementBag.isEmpty()) {
+        params.stopReason = EncodeBitstreamParams::UNKNOWN; // reset params.stopReason before traversal
 
-            quint64 lockWaitStart = usecTimestampNow();
-            _myServer->getOctree()->withReadLock([&]{
-                quint64 lockWaitEnd = usecTimestampNow();
-                lockWaitElapsedUsec = (float)(lockWaitEnd - lockWaitStart);
-                quint64 encodeStart = usecTimestampNow();
+        somethingToSend = traverseAndBuildPacket(params);
 
-                OctreeElementPointer subTree = nodeData->elementBag.extract();
-                if (!subTree) {
-                    return;
-                }
-
-                float octreeSizeScale = nodeData->getOctreeSizeScale();
-                int boundaryLevelAdjustClient = nodeData->getBoundaryLevelAdjust();
-
-                int boundaryLevelAdjust = boundaryLevelAdjustClient +
-                                          (viewFrustumChanged ? LOW_RES_MOVING_ADJUST : NO_BOUNDARY_ADJUST);
-
-                EncodeBitstreamParams params(INT_MAX, WANT_EXISTS_BITS, DONT_CHOP,
-                                             viewFrustumChanged, boundaryLevelAdjust, octreeSizeScale,
-                                             isFullScene, _myServer->getJurisdiction(), nodeData);
-                nodeData->copyCurrentViewFrustum(params.viewFrustum);
-                if (viewFrustumChanged) {
-                    nodeData->copyLastKnownViewFrustum(params.lastViewFrustum);
-                }
-
-                // Our trackSend() function is implemented by the server subclass, and will be called back
-                // during the encodeTreeBitstream() as new entities/data elements are sent
-                params.trackSend = [this](const QUuid& dataID, quint64 dataEdited) {
-                    _myServer->trackSend(dataID, dataEdited, _nodeUuid);
-                };
-
-                // TODO: should this include the lock time or not? This stat is sent down to the client,
-                // it seems like it may be a good idea to include the lock time as part of the encode time
-                // are reported to client. Since you can encode without the lock
-                nodeData->stats.encodeStarted();
-
-                // NOTE: this is where the tree "contents" are actaully packed
-                _myServer->getOctree()->encodeTreeBitstream(subTree, &_packetData, nodeData->elementBag, params);
-
-                quint64 encodeEnd = usecTimestampNow();
-                encodeElapsedUsec = (float)(encodeEnd - encodeStart);
-
-                // If after calling encodeTreeBitstream() there are no nodes left to send, then we know we've
-                // sent the entire scene. We want to know this below so we'll actually write this content into
-                // the packet and send it
-                completedScene = nodeData->elementBag.isEmpty();
-
-                if (params.stopReason == EncodeBitstreamParams::DIDNT_FIT) {
-                    lastNodeDidntFit = true;
-                    extraPackingAttempts++;
-                }
-
-                nodeData->stats.encodeStopped();
-            });
-        } else {
-            somethingToSend = false; // this will cause us to drop out of the loop...
+        if (params.stopReason == EncodeBitstreamParams::DIDNT_FIT) {
+            lastNodeDidntFit = true;
+            extraPackingAttempts++;
         }
 
+        // If the bag had contents but is now empty then we know we've sent the entire scene.
+        bool completedScene = bagHadSomething && nodeData->elementBag.isEmpty();
         if (completedScene || lastNodeDidntFit) {
             // we probably want to flush what has accumulated in nodeData but:
             // do we have more data to send? and is there room?
@@ -562,8 +555,7 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
             if (sendNow) {
                 quint64 packetSendingStart = usecTimestampNow();
                 _packetsSentThisInterval += handlePacketSend(node, nodeData);
-                quint64 packetSendingEnd = usecTimestampNow();
-                packetSendingElapsedUsec = (float)(packetSendingEnd - packetSendingStart);
+                packetSendingElapsedUsec = (float)(usecTimestampNow() - packetSendingStart);
 
                 targetSize = nodeData->getAvailable() - sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE);
                 extraPackingAttempts = 0;
@@ -576,14 +568,14 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
             }
             _packetData.changeSettings(true, targetSize); // will do reset - NOTE: Always compressed
         }
-        OctreeServer::trackTreeWaitTime(lockWaitElapsedUsec);
-        OctreeServer::trackEncodeTime(encodeElapsedUsec);
+        if (!somethingToSend) {
+            // these stats were not updated so we record zero to record this fact
+            OctreeServer::trackTreeWaitTime(0.0f);
+            OctreeServer::trackEncodeTime(0.0f);
+        }
         OctreeServer::trackCompressAndWriteTime(compressAndWriteElapsedUsec);
         OctreeServer::trackPacketSendingTime(packetSendingElapsedUsec);
-
-        quint64 endInside = usecTimestampNow();
-        quint64 elapsedInsideUsecs = endInside - startInside;
-        OctreeServer::trackInsideTime((float)elapsedInsideUsecs);
+        OctreeServer::trackInsideTime((float)(usecTimestampNow() - startInside));
     }
 
     if (somethingToSend && _myServer->wantsVerboseDebug()) {
diff --git a/assignment-client/src/octree/OctreeSendThread.h b/assignment-client/src/octree/OctreeSendThread.h
index d158539f57..583c30bdd3 100644
--- a/assignment-client/src/octree/OctreeSendThread.h
+++ b/assignment-client/src/octree/OctreeSendThread.h
@@ -53,7 +53,9 @@ protected:
 
     /// Called before a packetDistributor pass to allow for pre-distribution processing
     virtual void preDistributionProcessing() {};
-    virtual void traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData, bool viewFrustumChanged, bool isFullScene);
+    virtual void traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData,
+            bool viewFrustumChanged, bool isFullScene);
+    virtual bool traverseAndBuildPacket(EncodeBitstreamParams& params);
 
     OctreeServer* _myServer { nullptr };
     QWeakPointer<Node> _node;

From 8ad41227cecf5a64120e30b153e456f96b38242e Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 18 Aug 2017 13:35:13 -0700
Subject: [PATCH 17/78] use more correct method name

---
 assignment-client/src/octree/OctreeSendThread.cpp | 4 ++--
 assignment-client/src/octree/OctreeSendThread.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 5c4639a8e0..9e37be4b4e 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -458,7 +458,7 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
     return _truePacketsSent;
 }
 
-bool OctreeSendThread::traverseAndBuildPacket(EncodeBitstreamParams& params) {
+bool OctreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstreamParams& params) {
     bool somethingToSend = false;
     OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(params.nodeData);
     if (!nodeData->elementBag.isEmpty()) {
@@ -520,7 +520,7 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
         bool lastNodeDidntFit = false; // assume each node fits
         params.stopReason = EncodeBitstreamParams::UNKNOWN; // reset params.stopReason before traversal
 
-        somethingToSend = traverseAndBuildPacket(params);
+        somethingToSend = traverseTreeAndBuildNextPacketPayload(params);
 
         if (params.stopReason == EncodeBitstreamParams::DIDNT_FIT) {
             lastNodeDidntFit = true;
diff --git a/assignment-client/src/octree/OctreeSendThread.h b/assignment-client/src/octree/OctreeSendThread.h
index 583c30bdd3..8f75092528 100644
--- a/assignment-client/src/octree/OctreeSendThread.h
+++ b/assignment-client/src/octree/OctreeSendThread.h
@@ -55,7 +55,7 @@ protected:
     virtual void preDistributionProcessing() {};
     virtual void traverseTreeAndSendContents(SharedNodePointer node, OctreeQueryNode* nodeData,
             bool viewFrustumChanged, bool isFullScene);
-    virtual bool traverseAndBuildPacket(EncodeBitstreamParams& params);
+    virtual bool traverseTreeAndBuildNextPacketPayload(EncodeBitstreamParams& params);
 
     OctreeServer* _myServer { nullptr };
     QWeakPointer<Node> _node;

From 7da4bc04d3a9eb4db5ffbd9a30a7e20f97dce57a Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 13:36:07 -0700
Subject: [PATCH 18/78] Add DodgeBall.

---
 .../marketplace/dodgeBall/dodgeBall.js        | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)
 create mode 100644 unpublishedScripts/marketplace/dodgeBall/dodgeBall.js

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
new file mode 100644
index 0000000000..9bd1032821
--- /dev/null
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -0,0 +1,164 @@
+(function () {
+
+    var FORCE_DROP_CHANNEL = "Hifi-Hand-Drop";
+
+    var proxInterval,
+        proxTimeout;
+
+    var _entityID;
+    this.preload = function (entityID) {
+        _entityID = entityID;
+
+        Entities.editEntity(_entityID, {
+            userData: '{"grabbableKey": {"grabbable": true}'
+        });
+    };
+
+    var particleTrailEntity = null;
+
+    function particleTrail() {
+
+        var props = {
+            type: 'ParticleEffect',
+            name: 'Particle',
+            parentID: _entityID,
+            isEmitting: true,
+            lifespan: 2.0,
+            maxParticles: 100,
+            textures: 'https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png',
+            emitRate: 50,
+            emitSpeed: 0,
+            emitterShouldTrail: true,
+            particleRadius: 0,
+            radiusSpread: 0,
+            radiusStart: .2,
+            radiusFinish: 0.1,
+            color: {
+                red: 201,
+                blue: 201,
+                green: 34
+            },
+
+            accelerationSpread: {
+                x: 0,
+                y: 0,
+                z: 0
+            },
+            alpha: 0,
+            alphaSpread: 0,
+            alphaStart: 1,
+            alphaFinish: 0,
+            polarStart: 0,
+            polarFinish: 0,
+            azimuthStart: -180,
+            azimuthFinish: 180
+        };
+
+        if (particleTrailEntity === null) {
+            particleTrailEntity = Entities.addEntity(props);
+        } else {
+            Entities.editEntity(particleTrailEntity, {})
+        }
+    }
+
+    function particleExplode() {
+        Entities.deleteEntity(particleTrailEntity);
+        particleTrailEntity = null;
+        var entPos = Entities.getEntityProperties(_entityID, 'position').position;
+        var props = {
+            type: 'ParticleEffect',
+            name: 'Particle',
+            parentID: _entityID,
+            isEmitting: true,
+            lifespan: 2,
+            maxParticles: 10,
+            position: entPos,
+            textures: 'https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png',
+            emitRate: 1,
+            emitSpeed: 0,
+
+            emitterShouldTrail: false,
+            particleRadius: 1,
+            radiusSpread: 0,
+            radiusStart: 0,
+            radiusFinish: 1,
+            color: {
+                red: 232,
+                blue: 232,
+                green: 26
+            },
+
+            emitAcceleration: {
+                x: 0,
+                y: 0,
+                z: 0
+            },
+
+            alpha: 0,
+            alphaSpread: 0,
+            alphaStart: 1,
+            alphaFinish: .5,
+            polarStart: 0,
+            polarFinish: 0,
+            azimuthStart: -180,
+            azimuthFinish: 180
+        };
+        var exposionParticles = Entities.addEntity(props);
+        Entities.editEntity(_entityID, {
+            velocity: Vec3.ZERO,
+            dynamic: false
+        });
+        Script.setTimeout(function () {
+            Entities.deleteEntity(exposionParticles);
+            Entities.editEntity(_entityID, {
+                dynamic: true
+            })
+        }, 500);
+    }
+
+
+    function clearProxCheck() {
+        if (proxInterval) Script.clearInterval(proxInterval);
+        if (proxTimeout) Script.clearTimeout(proxTimeout);
+    }
+
+    function proxCheck() {
+        var avList = AvatarList.getAvatarIdentifiers();
+        var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
+        var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
+
+        particleTrail();
+        if (isAnyAvatarInRange) {
+            clearProxCheck();
+            particleExplode();
+        }
+    }
+
+    this.startDistanceGrab = function (thisEntityID, triggerHandAndAvatarUUIDArray) {
+        clearProxCheck();
+        var triggerHand = triggerHandAndAvatarUUIDArray[0];
+        var avatarUUID = triggerHandAndAvatarUUIDArray[1];
+
+        var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
+        if (Vec3.distance(ballPos, AvatarList.getAvatar(avatarUUID).position) > 2) {
+            Messages.sendMessage(FORCE_DROP_CHANNEL, triggerHand, true);
+        }
+
+    };
+    this.startNearGrab = function (thisEntityID, triggerHandAndAvatarUUIDArray) {
+        clearProxCheck();
+    };
+
+    this.releaseGrab = function (thisEntityID) {
+
+        Script.setTimeout(function () {
+            proxInterval = Script.setInterval(proxCheck, 50);
+        }, 150); // Setting a delay to give it time to leave initial avatar without proc.
+
+        proxTimeout = Script.setTimeout(function () {
+            Script.clearInterval(proxInterval);
+            Entities.deleteEntity(particleTrailEntity);
+        }, 10000)
+    }
+
+});

From aee35b751ece12436a742ac387eacc687c53b5a8 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Fri, 18 Aug 2017 14:35:48 -0700
Subject: [PATCH 19/78] replace 'unsigned long' with uint64_t

---
 libraries/octree/src/Octree.cpp | 30 +++++++++++++++---------------
 libraries/octree/src/Octree.h   | 11 ++++++-----
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index cde2fe7026..ad16a97bf6 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -1636,7 +1636,7 @@ bool Octree::readFromFile(const char* fileName) {
 
     QDataStream fileInputStream(&file);
     QFileInfo fileInfo(qFileName);
-    unsigned long fileLength = fileInfo.size();
+    uint64_t fileLength = fileInfo.size();
 
     emit importSize(1.0f, 1.0f, 1.0f);
     emit importProgress(0);
@@ -1713,7 +1713,7 @@ bool Octree::readFromURL(const QString& urlString) {
 }
 
 
-bool Octree::readFromStream(unsigned long streamLength, QDataStream& inputStream, const QString& marketplaceID) {
+bool Octree::readFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID) {
     // decide if this is binary SVO or JSON-formatted SVO
     QIODevice *device = inputStream.device();
     char firstChar;
@@ -1730,14 +1730,14 @@ bool Octree::readFromStream(unsigned long streamLength, QDataStream& inputStream
 }
 
 
-bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStream) {
+bool Octree::readSVOFromStream(uint64_t streamLength, QDataStream& inputStream) {
     qWarning() << "SVO file format depricated. Support for reading SVO files is no longer support and will be removed soon.";
 
     bool fileOk = false;
 
     PacketVersion gotVersion = 0;
 
-    unsigned long headerLength = 0; // bytes in the header
+    uint64_t headerLength = 0; // bytes in the header
 
     bool wantImportProgress = true;
 
@@ -1749,14 +1749,14 @@ bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStr
     if (getWantSVOfileVersions()) {
 
         // read just enough of the file to parse the header...
-        const unsigned long HEADER_LENGTH = sizeof(int) + sizeof(PacketVersion);
+        const uint64_t HEADER_LENGTH = sizeof(int) + sizeof(PacketVersion);
         unsigned char fileHeader[HEADER_LENGTH];
         inputStream.readRawData((char*)&fileHeader, HEADER_LENGTH);
 
         headerLength = HEADER_LENGTH; // we need this later to skip to the data
 
         unsigned char* dataAt = (unsigned char*)&fileHeader;
-        unsigned long  dataLength = HEADER_LENGTH;
+        uint64_t  dataLength = HEADER_LENGTH;
 
         // if so, read the first byte of the file and see if it matches the expected version code
         int intPacketType;
@@ -1802,7 +1802,7 @@ bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStr
         if (!hasBufferBreaks) {
 
             // read the entire file into a buffer, WHAT!? Why not.
-            unsigned long dataLength = streamLength - headerLength;
+            uint64_t dataLength = streamLength - headerLength;
             unsigned char* entireFileDataSection = new unsigned char[dataLength];
             inputStream.readRawData((char*)entireFileDataSection, dataLength);
 
@@ -1817,9 +1817,9 @@ bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStr
         } else {
 
 
-            unsigned long dataLength = streamLength - headerLength;
-            unsigned long remainingLength = dataLength;
-            const unsigned long MAX_CHUNK_LENGTH = MAX_OCTREE_PACKET_SIZE * 2;
+            uint64_t dataLength = streamLength - headerLength;
+            uint64_t remainingLength = dataLength;
+            const uint64_t MAX_CHUNK_LENGTH = MAX_OCTREE_PACKET_SIZE * 2;
             unsigned char* fileChunk = new unsigned char[MAX_CHUNK_LENGTH];
 
             while (remainingLength > 0) {
@@ -1845,7 +1845,7 @@ bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStr
                 remainingLength -= chunkLength;
 
                 unsigned char* dataAt = fileChunk;
-                unsigned long  dataLength = chunkLength;
+                uint64_t  dataLength = chunkLength;
 
                 ReadBitstreamToTreeParams args(NO_EXISTS_BITS, NULL, 0,
                                                     SharedNodePointer(), wantImportProgress, gotVersion);
@@ -1885,7 +1885,7 @@ QJsonDocument addMarketplaceIDToDocumentEntities(QJsonDocument& doc, const QStri
 
 const int READ_JSON_BUFFER_SIZE = 2048;
 
-bool Octree::readJSONFromStream(unsigned long streamLength, QDataStream& inputStream, const QString& marketplaceID /*=""*/) {
+bool Octree::readJSONFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID /*=""*/) {
     // if the data is gzipped we may not have a useful bytesAvailable() result, so just keep reading until
     // we get an eof.  Leave streamLength parameter for consistency.
 
@@ -1980,14 +1980,14 @@ bool Octree::writeToJSONFile(const char* fileName, const OctreeElementPointer& e
     return success;
 }
 
-unsigned long Octree::getOctreeElementsCount() {
-    unsigned long nodeCount = 0;
+uint64_t Octree::getOctreeElementsCount() {
+    uint64_t nodeCount = 0;
     recurseTreeWithOperation(countOctreeElementsOperation, &nodeCount);
     return nodeCount;
 }
 
 bool Octree::countOctreeElementsOperation(const OctreeElementPointer& element, void* extraData) {
-    (*(unsigned long*)extraData)++;
+    (*(uint64_t*)extraData)++;
     return true; // keep going
 }
 
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index 38454d20b5..3b84618a56 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -14,6 +14,7 @@
 
 #include <memory>
 #include <set>
+#include <stdint.h>
 
 #include <QHash>
 #include <QObject>
@@ -231,7 +232,7 @@ public:
 
     virtual void eraseAllOctreeElements(bool createNewRoot = true);
 
-    void readBitstreamToTree(const unsigned char* bitstream,  unsigned long int bufferSizeBytes, ReadBitstreamToTreeParams& args);
+    void readBitstreamToTree(const unsigned char* bitstream,  uint64_t bufferSizeBytes, ReadBitstreamToTreeParams& args);
     void deleteOctalCodeFromTree(const unsigned char* codeBuffer, bool collapseEmptyTrees = DONT_COLLAPSE);
     void reaverageOctreeElements(OctreeElementPointer startElement = OctreeElementPointer());
 
@@ -301,13 +302,13 @@ public:
     // Octree importers
     bool readFromFile(const char* filename);
     bool readFromURL(const QString& url); // will support file urls as well...
-    bool readFromStream(unsigned long streamLength, QDataStream& inputStream, const QString& marketplaceID="");
-    bool readSVOFromStream(unsigned long streamLength, QDataStream& inputStream);
-    bool readJSONFromStream(unsigned long streamLength, QDataStream& inputStream, const QString& marketplaceID="");
+    bool readFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID="");
+    bool readSVOFromStream(uint64_t streamLength, QDataStream& inputStream);
+    bool readJSONFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID="");
     bool readJSONFromGzippedFile(QString qFileName);
     virtual bool readFromMap(QVariantMap& entityDescription) = 0;
 
-    unsigned long getOctreeElementsCount();
+    uint64_t getOctreeElementsCount();
 
     bool getShouldReaverage() const { return _shouldReaverage; }
 

From 397d2a68534cea8d5c5e832571b676148d223fc9 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 16:12:56 -0700
Subject: [PATCH 20/78] Minor Code Cleanup.

---
 unpublishedScripts/marketplace/dodgeBall/dodgeBall.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 9bd1032821..05d7935757 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -38,7 +38,6 @@
                 blue: 201,
                 green: 34
             },
-
             accelerationSpread: {
                 x: 0,
                 y: 0,
@@ -76,7 +75,6 @@
             textures: 'https://content.highfidelity.com/DomainContent/production/Particles/wispy-smoke.png',
             emitRate: 1,
             emitSpeed: 0,
-
             emitterShouldTrail: false,
             particleRadius: 1,
             radiusSpread: 0,
@@ -87,13 +85,11 @@
                 blue: 232,
                 green: 26
             },
-
             emitAcceleration: {
                 x: 0,
                 y: 0,
                 z: 0
             },
-
             alpha: 0,
             alphaSpread: 0,
             alphaStart: 1,
@@ -123,7 +119,6 @@
     }
 
     function proxCheck() {
-        var avList = AvatarList.getAvatarIdentifiers();
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
         var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
 

From 37ee2a31d4a7dcb0e8b76a4764a53b06b9cba4f9 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 18:50:03 -0700
Subject: [PATCH 21/78] Remove particleTrailEntity from every prox check, the
 trail no longer needs to be updated each check.

---
 unpublishedScripts/marketplace/dodgeBall/dodgeBall.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 05d7935757..4ccc41b3b7 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -53,11 +53,7 @@
             azimuthFinish: 180
         };
 
-        if (particleTrailEntity === null) {
             particleTrailEntity = Entities.addEntity(props);
-        } else {
-            Entities.editEntity(particleTrailEntity, {})
-        }
     }
 
     function particleExplode() {
@@ -122,7 +118,8 @@
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
         var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
 
-        particleTrail();
+        if (particleTrailEntity) particleTrail();
+
         if (isAnyAvatarInRange) {
             clearProxCheck();
             particleExplode();

From 9ff68ce10c47c2831d8207b58ec1dc4d4cedf7d1 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 18:51:44 -0700
Subject: [PATCH 22/78] Remove particleTrailEntity from every prox check, the
 trail no longer needs to be updated each check.

---
 unpublishedScripts/marketplace/dodgeBall/dodgeBall.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 4ccc41b3b7..6330b1c9b5 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -118,7 +118,7 @@
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
         var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
 
-        if (particleTrailEntity) particleTrail();
+        if (particleTrailEntity === null) particleTrail();
 
         if (isAnyAvatarInRange) {
             clearProxCheck();

From 6892cdb57de04c936a73f890119951a5e258c781 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Fri, 18 Aug 2017 19:20:34 -0700
Subject: [PATCH 23/78] Consolidate Clear Prox Code, Add Clear Prox to
 collisionWithEntity.

---
 .../marketplace/dodgeBall/dodgeBall.js        | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 6330b1c9b5..737db9770c 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -57,8 +57,6 @@
     }
 
     function particleExplode() {
-        Entities.deleteEntity(particleTrailEntity);
-        particleTrailEntity = null;
         var entPos = Entities.getEntityProperties(_entityID, 'position').position;
         var props = {
             type: 'ParticleEffect',
@@ -110,7 +108,12 @@
 
 
     function clearProxCheck() {
-        if (proxInterval) Script.clearInterval(proxInterval);
+        if (proxInterval) {
+            Script.clearInterval(proxInterval);
+            Entities.deleteEntity(particleTrailEntity);
+            particleTrailEntity = null;
+        }
+
         if (proxTimeout) Script.clearTimeout(proxTimeout);
     }
 
@@ -118,8 +121,6 @@
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
         var isAnyAvatarInRange = AvatarList.isAvatarInRange(ballPos, 1);
 
-        if (particleTrailEntity === null) particleTrail();
-
         if (isAnyAvatarInRange) {
             clearProxCheck();
             particleExplode();
@@ -143,14 +144,19 @@
 
     this.releaseGrab = function (thisEntityID) {
 
+        if (particleTrailEntity === null) particleTrail();
+
         Script.setTimeout(function () {
             proxInterval = Script.setInterval(proxCheck, 50);
-        }, 150); // Setting a delay to give it time to leave initial avatar without proc.
+        }, 200); // Setting a delay to give it time to leave initial avatar without proc.
 
         proxTimeout = Script.setTimeout(function () {
-            Script.clearInterval(proxInterval);
-            Entities.deleteEntity(particleTrailEntity);
+            clearProxCheck();
         }, 10000)
-    }
+    };
+
+    this.collisionWithEntity = function(thisEntityID,  collisionEntityID, collisionInfo) {
+        clearProxCheck();
+    };
 
 });

From bad8c39444384aa3853815bc54e011c1d9dc4293 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sat, 19 Aug 2017 17:46:52 +0200
Subject: [PATCH 24/78] Align user/login text right border with tablet buttons

---
 interface/resources/qml/hifi/tablet/Tablet.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index 521c3b2e14..a99df632e5 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -113,7 +113,7 @@ Item {
             width: 150
             height: 50
             anchors.right: parent.right
-            anchors.rightMargin: 20
+            anchors.rightMargin: 30
             anchors.verticalCenter: parent.verticalCenter
 
             RalewaySemiBold {

From 56dedea66cb970ef3aa9fc7a6fd0174003db1b1c Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sun, 20 Aug 2017 17:57:03 +0200
Subject: [PATCH 25/78] 1st experimental approach

---
 .../qml/controls/TabletWebScreen.qml          | 165 +++++++++++-------
 .../resources/qml/controls/TabletWebView.qml  | 162 +++++++++--------
 interface/resources/qml/controls/WebView.qml  | 160 ++++++++++-------
 3 files changed, 279 insertions(+), 208 deletions(-)

diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index 1de31aba41..e1615e1442 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.5
-import QtWebEngine 1.1
+import QtQuick 2.7
+import QtWebEngine 1.5
 import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
@@ -23,91 +23,124 @@ Item {
 
     property alias viewProfile: root.profile
 
-    WebEngineView {
-        id: root
-        objectName: "webEngineView"
+    Flickable {
+        id: flick
         x: 0
         y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        profile: HFWebEngineProfile;
+        WebEngineView {
+            id: root
+            objectName: "webEngineView"
+            anchors.fill: parent
 
-        property string userScriptUrl: ""
+            profile: HFWebEngineProfile;
 
-        // creates a global EventBridge object.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
+            property string userScriptUrl: ""
 
-        // detects when to raise and lower virtual keyboard
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
+            // creates a global EventBridge object.
+            WebEngineScript {
+                id: createGlobalEventBridge
+                sourceCode: eventBridgeJavaScriptToInject
+                injectionPoint: WebEngineScript.DocumentCreation
+                worldId: WebEngineScript.MainWorld
+            }
 
-        // User script.
-        WebEngineScript {
-            id: userScript
-            sourceUrl: root.userScriptUrl
-            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-            worldId: WebEngineScript.MainWorld
-        }
-        
-        property string urlTag: "noDownload=false";
+            // detects when to raise and lower virtual keyboard
+            WebEngineScript {
+                id: raiseAndLowerKeyboard
+                injectionPoint: WebEngineScript.Deferred
+                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+                worldId: WebEngineScript.MainWorld
+            }
 
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+            // User script.
+            WebEngineScript {
+                id: userScript
+                sourceUrl: root.userScriptUrl
+                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+                worldId: WebEngineScript.MainWorld
+            }
 
-        property string newUrl: ""
-        
+            property string urlTag: "noDownload=false";
 
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
+            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
 
-            root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
-        }
+            property string newUrl: ""
 
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
+            onContentsSizeChanged: {
+                console.log("WebView contentsSize", contentsSize)
+                flick.contentWidth = Math.max(contentsSize.width, flick.width)
+                flick.contentHeight = Math.max(contentsSize.height, flick.height)
+            }
 
-        onLoadingChanged: {
-            keyboardRaised = false;
-            punctuationMode = false;
-            keyboard.resetShiftMode(false);
+            Component.onCompleted: {
+                webChannel.registerObject("eventBridge", eventBridge);
+                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+                // Ensure the JS from the web-engine makes it to our logging
+                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+                });
 
-            // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                var url = loadRequest.url.toString();
-                url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                if (urlHandler.canHandleUrl(url)) {
-                    if (urlHandler.handleUrl(url)) {
-                        root.stop();
+                root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
+            }
+
+            onFeaturePermissionRequested: {
+                grantFeaturePermission(securityOrigin, feature, true);
+            }
+
+            onLoadingChanged: {
+                console.log("loading changed", loadRequest.status)
+                keyboardRaised = false;
+                punctuationMode = false;
+                keyboard.resetShiftMode(false);
+
+                // Required to support clicking on "hifi://" links
+                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    flick.contentWidth = -1
+                    flick.contentHeight = -1
+                    var url = loadRequest.url.toString();
+                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
+                    if (urlHandler.canHandleUrl(url)) {
+                        if (urlHandler.handleUrl(url)) {
+                            root.stop();
+                        }
                     }
                 }
-            }
-        }
+                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+//                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
+//                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                    root.runJavaScript(
+                                "document.body.scrollHeight;",
+                                function (i_actualPageHeight) {
+                                    console.log("on reloaded documentElement.scrollHeigh:", i_actualPageHeight)
+//                                    flick.contentHeight = Math.max (
+//                                                i_actualPageHeight, flick.height);
+                                })
+                    root.runJavaScript(
+                                "document.body.scrollWidth;",
+                                function (i_actualPageWidth) {
+                                    console.log("on reloaded documentElement.scrollWidth:", i_actualPageWidth)
 
-        onNewViewRequested:{
-            // desktop is not defined for web-entities or tablet
-            if (typeof desktop !== "undefined") {
-                desktop.openBrowserWindow(request, profile);
-            } else {
-                tabletRoot.openBrowserWindow(request, profile);
+//                                    flick.contentWidth = Math.max (
+//                                                i_actualPageWidth, flick.width);
+                                })
+                    console.log("on reloaded content size:", contentsSize)
+                }
             }
-        }
 
-        HiFiControls.WebSpinner { }
+            onNewViewRequested:{
+                // desktop is not defined for web-entities or tablet
+                if (typeof desktop !== "undefined") {
+                    desktop.openBrowserWindow(request, profile);
+                } else {
+                    tabletRoot.openBrowserWindow(request, profile);
+                }
+            }
+
+            HiFiControls.WebSpinner { }
+        }
     }
 
     HiFiControls.Keyboard {
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 8547f67468..6fafab81a9 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.5
+import QtQuick 2.7
 import QtQuick.Controls 1.4
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 import "../styles" as HifiStyles
@@ -136,99 +136,107 @@ Item {
         loadUrl(url);
     }
 
-    WebEngineView {
-        id: webview
-        objectName: "webEngineView"
+    Flickable {
+        id: flick
         x: 0
         y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
         anchors.top: buttons.bottom
-        profile: HFWebEngineProfile;
 
-        property string userScriptUrl: ""
+        WebEngineView {
+            id: webview
+            objectName: "webEngineView"
+            anchors.fill: parent
 
-        // creates a global EventBridge object.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
+            profile: HFWebEngineProfile;
 
-        // detects when to raise and lower virtual keyboard
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
+            property string userScriptUrl: ""
 
-        // User script.
-        WebEngineScript {
-            id: userScript
-            sourceUrl: webview.userScriptUrl
-            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-            worldId: WebEngineScript.MainWorld
-        }
-
-        property string urlTag: "noDownload=false";
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-        property string newUrl: ""
-
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
-        }
-
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
-
-        onUrlChanged: {
-            // Record history, skipping null and duplicate items.
-            var urlString = url + "";
-            urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
-            if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
-                historyIndex++;
-                history = history.slice(0, historyIndex);
-                history.push(urlString);
+            // creates a global EventBridge object.
+            WebEngineScript {
+                id: createGlobalEventBridge
+                sourceCode: eventBridgeJavaScriptToInject
+                injectionPoint: WebEngineScript.DocumentCreation
+                worldId: WebEngineScript.MainWorld
             }
-        }
 
-        onLoadingChanged: {
-            keyboardRaised = false;
-            punctuationMode = false;
-            keyboard.resetShiftMode(false);
-            // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                var url = loadRequest.url.toString();
-                if (urlHandler.canHandleUrl(url)) {
-                    if (urlHandler.handleUrl(url)) {
-                        root.stop();
-                    }
+            // detects when to raise and lower virtual keyboard
+            WebEngineScript {
+                id: raiseAndLowerKeyboard
+                injectionPoint: WebEngineScript.Deferred
+                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+                worldId: WebEngineScript.MainWorld
+            }
+
+            // User script.
+            WebEngineScript {
+                id: userScript
+                sourceUrl: webview.userScriptUrl
+                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+                worldId: WebEngineScript.MainWorld
+            }
+
+            property string urlTag: "noDownload=false";
+            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+            property string newUrl: ""
+
+            Component.onCompleted: {
+                webChannel.registerObject("eventBridge", eventBridge);
+                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+                // Ensure the JS from the web-engine makes it to our logging
+                webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+                });
+            }
+
+            onFeaturePermissionRequested: {
+                grantFeaturePermission(securityOrigin, feature, true);
+            }
+
+            onUrlChanged: {
+                // Record history, skipping null and duplicate items.
+                var urlString = url + "";
+                urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
+                if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
+                    historyIndex++;
+                    history = history.slice(0, historyIndex);
+                    history.push(urlString);
                 }
             }
 
-            if (WebEngineView.LoadFailedStatus == loadRequest.status) {
-                console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+            onLoadingChanged: {
+                keyboardRaised = false;
+                punctuationMode = false;
+                keyboard.resetShiftMode(false);
+                // Required to support clicking on "hifi://" links
+                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    var url = loadRequest.url.toString();
+                    if (urlHandler.canHandleUrl(url)) {
+                        if (urlHandler.handleUrl(url)) {
+                            root.stop();
+                        }
+                    }
+                }
+
+                if (WebEngineView.LoadFailedStatus == loadRequest.status) {
+                    console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+                }
+
+                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
+                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                    webview.forceActiveFocus();
+                }
             }
 
-            if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                webview.forceActiveFocus();
+            onNewViewRequested: {
+                request.openIn(webview);
             }
-        }
-        
-        onNewViewRequested: {
-            request.openIn(webview);
-        }
 
-        HiFiControls.WebSpinner { }
+            HiFiControls.WebSpinner { }
+        }
     }
 
     HiFiControls.Keyboard {
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 3f2ac6363b..2013de4ef9 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.5
-import QtWebEngine 1.1
+import QtQuick 2.7
+import QtWebEngine 1.5
 import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
@@ -23,89 +23,119 @@ Item {
 
     property alias viewProfile: root.profile
 
-    WebEngineView {
-        id: root
-        objectName: "webEngineView"
+    Flickable {
+        id: flick
         x: 0
         y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        profile: HFWebEngineProfile;
 
-        property string userScriptUrl: ""
+        WebEngineView {
+            id: root
+            objectName: "webEngineView"
+            anchors.fill: parent
 
-        // creates a global EventBridge object.
-        WebEngineScript {
-            id: createGlobalEventBridge
-            sourceCode: eventBridgeJavaScriptToInject
-            injectionPoint: WebEngineScript.DocumentCreation
-            worldId: WebEngineScript.MainWorld
-        }
+            profile: HFWebEngineProfile;
 
-        // detects when to raise and lower virtual keyboard
-        WebEngineScript {
-            id: raiseAndLowerKeyboard
-            injectionPoint: WebEngineScript.Deferred
-            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-            worldId: WebEngineScript.MainWorld
-        }
+            property string userScriptUrl: ""
 
-        // User script.
-        WebEngineScript {
-            id: userScript
-            sourceUrl: root.userScriptUrl
-            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-            worldId: WebEngineScript.MainWorld
-        }
-        
-        property string urlTag: "noDownload=false";
+            // creates a global EventBridge object.
+            WebEngineScript {
+                id: createGlobalEventBridge
+                sourceCode: eventBridgeJavaScriptToInject
+                injectionPoint: WebEngineScript.DocumentCreation
+                worldId: WebEngineScript.MainWorld
+            }
 
-        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+            // detects when to raise and lower virtual keyboard
+            WebEngineScript {
+                id: raiseAndLowerKeyboard
+                injectionPoint: WebEngineScript.Deferred
+                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+                worldId: WebEngineScript.MainWorld
+            }
 
-        property string newUrl: ""
+            // User script.
+            WebEngineScript {
+                id: userScript
+                sourceUrl: root.userScriptUrl
+                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+                worldId: WebEngineScript.MainWorld
+            }
 
-        Component.onCompleted: {
-            webChannel.registerObject("eventBridge", eventBridge);
-            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-            // Ensure the JS from the web-engine makes it to our logging
-            root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-            });
+            property string urlTag: "noDownload=false";
 
-        }
+            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
 
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
+            property string newUrl: ""
 
-        onLoadingChanged: {
-            keyboardRaised = false;
-            punctuationMode = false;
-            keyboard.resetShiftMode(false);
+            Component.onCompleted: {
+                webChannel.registerObject("eventBridge", eventBridge);
+                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+                // Ensure the JS from the web-engine makes it to our logging
+                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+                });
 
-            // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                var url = loadRequest.url.toString();
-                url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                if (urlHandler.canHandleUrl(url)) {
-                    if (urlHandler.handleUrl(url)) {
-                        root.stop();
+            }
+
+            onFeaturePermissionRequested: {
+                grantFeaturePermission(securityOrigin, feature, true);
+            }
+
+            onContentsSizeChanged: {
+                console.log("WebView contentsSize", contentsSize)
+                flick.contentWidth = Math.max(contentsSize.width, flick.width)
+                flick.contentHeight = Math.max(contentsSize.height, flick.height)
+            }
+
+            onLoadingChanged: {
+                keyboardRaised = false;
+                punctuationMode = false;
+                keyboard.resetShiftMode(false);
+
+                // Required to support clicking on "hifi://" links
+                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    var url = loadRequest.url.toString();
+                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
+                    if (urlHandler.canHandleUrl(url)) {
+                        if (urlHandler.handleUrl(url)) {
+                            root.stop();
+                        }
                     }
                 }
-            }
-        }
+                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
 
-        onNewViewRequested:{
-            // desktop is not defined for web-entities or tablet
-            if (typeof desktop !== "undefined") {
-                desktop.openBrowserWindow(request, profile);
-            } else {
-                tabletRoot.openBrowserWindow(request, profile);
-            }
-        }
+//                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
+//                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                    root.runJavaScript(
+                                   "document.body.scrollHeight;",
+                                   function (i_actualPageHeight) {
+                                       flick.contentHeight = Math.max (
+                                           i_actualPageHeight, flick.height);
+                                   })
+                               root.runJavaScript(
+                                   "document.body.scrollWidth;",
+                                   function (i_actualPageWidth) {
+                                       flick.contentWidth = Math.max (
+                                           i_actualPageWidth, flick.width);
+                                   })
 
-        HiFiControls.WebSpinner { }
+                }
+            }
+
+            onNewViewRequested:{
+                // desktop is not defined for web-entities or tablet
+                if (typeof desktop !== "undefined") {
+                    desktop.openBrowserWindow(request, profile);
+                } else {
+                    tabletRoot.openBrowserWindow(request, profile);
+                }
+            }
+
+            HiFiControls.WebSpinner { }
+        }
     }
 
     HiFiControls.Keyboard {

From 78e9bb6020bf874410f9c59dad5d37f84c128a85 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Sun, 20 Aug 2017 23:06:23 +0200
Subject: [PATCH 26/78] almost works for marketplace

---
 .../qml/controls/TabletWebScreen.qml          | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index e1615e1442..4ed71282d4 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -91,15 +91,16 @@ Item {
             }
 
             onLoadingChanged: {
-                console.log("loading changed", loadRequest.status)
                 keyboardRaised = false;
                 punctuationMode = false;
                 keyboard.resetShiftMode(false);
 
                 // Required to support clicking on "hifi://" links
                 if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                    flick.contentWidth = -1
-                    flick.contentHeight = -1
+                    flick.contentWidth = 0
+                    flick.contentHeight = 0
+                    flick.contentX = 0
+                    flick.contentY = 0
                     var url = loadRequest.url.toString();
                     url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
                     if (urlHandler.canHandleUrl(url)) {
@@ -109,24 +110,17 @@ Item {
                     }
                 }
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-//                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
-//                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
-                    root.runJavaScript(
-                                "document.body.scrollHeight;",
+                    root.runJavaScript("document.body.scrollHeight;",
                                 function (i_actualPageHeight) {
                                     console.log("on reloaded documentElement.scrollHeigh:", i_actualPageHeight)
-//                                    flick.contentHeight = Math.max (
-//                                                i_actualPageHeight, flick.height);
+                                    flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
                                 })
-                    root.runJavaScript(
-                                "document.body.scrollWidth;",
+                    root.runJavaScript("document.body.scrollWidth;",
                                 function (i_actualPageWidth) {
                                     console.log("on reloaded documentElement.scrollWidth:", i_actualPageWidth)
 
-//                                    flick.contentWidth = Math.max (
-//                                                i_actualPageWidth, flick.width);
+                                    flick.contentWidth = Math.max(i_actualPageWidth, flick.width);
                                 })
-                    console.log("on reloaded content size:", contentsSize)
                 }
             }
 

From 3be684b9732531fd43ce66daf0870d63ad97c50b Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 21 Aug 2017 16:31:25 +0200
Subject: [PATCH 27/78] Fixed spinner in center. Flicking only vertically

---
 .../resources/qml/controls-uit/WebSpinner.qml |  3 +-
 .../qml/controls/TabletWebScreen.qml          | 60 +++++++++----------
 .../resources/qml/controls/TabletWebView.qml  | 29 +++++++--
 3 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controls-uit/WebSpinner.qml
index 6323bff1a7..3e7ca6ec22 100644
--- a/interface/resources/qml/controls-uit/WebSpinner.qml
+++ b/interface/resources/qml/controls-uit/WebSpinner.qml
@@ -11,8 +11,9 @@
 import QtQuick 2.5
 
 AnimatedImage {
+    property Item webroot: parent
     source: "../../icons/loader-snake-64-w.gif"
-    visible: parent.loading && /^(http.*|)$/i.test(parent.url.toString())
+    visible: webroot.loading && /^(http.*|)$/i.test(webroot.url.toString())
     z: 10000
     anchors {
         horizontalCenter: parent.horizontalCenter
diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index 4ed71282d4..eeb211a16d 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -4,11 +4,12 @@ import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
 Item {
-    property alias url: root.url
-    property alias scriptURL: root.userScriptUrl
-    property alias canGoBack: root.canGoBack;
-    property var goBack: root.goBack;
-    property alias urlTag: root.urlTag
+    id: root
+    property alias url: webroot.url
+    property alias scriptURL: webroot.userScriptUrl
+    property alias canGoBack: webroot.canGoBack;
+    property var goBack: webroot.goBack;
+    property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
     property bool punctuationMode: false
@@ -21,17 +22,15 @@ Item {
     }
     */
 
-    property alias viewProfile: root.profile
+    property alias viewProfile: webroot.profile
 
     Flickable {
         id: flick
-        x: 0
-        y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
         WebEngineView {
-            id: root
+            id: webroot
             objectName: "webEngineView"
             anchors.fill: parent
 
@@ -58,7 +57,7 @@ Item {
             // User script.
             WebEngineScript {
                 id: userScript
-                sourceUrl: root.userScriptUrl
+                sourceUrl: webroot.userScriptUrl
                 injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
                 worldId: WebEngineScript.MainWorld
             }
@@ -69,21 +68,25 @@ Item {
 
             property string newUrl: ""
 
+            //disable popup
+            onContextMenuRequested: {
+                request.accepted = true;
+            }
+
             onContentsSizeChanged: {
-                console.log("WebView contentsSize", contentsSize)
-                flick.contentWidth = Math.max(contentsSize.width, flick.width)
-                flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                flick.contentHeight = Math.max(contentsSize.height, flick.height);
+                flick.contentWidth = flick.width
             }
 
             Component.onCompleted: {
                 webChannel.registerObject("eventBridge", eventBridge);
                 webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
                 // Ensure the JS from the web-engine makes it to our logging
-                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                webroot.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
                     console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
                 });
 
-                root.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
+                webroot.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
             }
 
             onFeaturePermissionRequested: {
@@ -99,28 +102,19 @@ Item {
                 if (WebEngineView.LoadStartedStatus == loadRequest.status) {
                     flick.contentWidth = 0
                     flick.contentHeight = 0
-                    flick.contentX = 0
-                    flick.contentY = 0
                     var url = loadRequest.url.toString();
                     url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
                     if (urlHandler.canHandleUrl(url)) {
                         if (urlHandler.handleUrl(url)) {
-                            root.stop();
+                            webroot.stop();
                         }
                     }
                 }
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    root.runJavaScript("document.body.scrollHeight;",
-                                function (i_actualPageHeight) {
-                                    console.log("on reloaded documentElement.scrollHeigh:", i_actualPageHeight)
-                                    flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-                                })
-                    root.runJavaScript("document.body.scrollWidth;",
-                                function (i_actualPageWidth) {
-                                    console.log("on reloaded documentElement.scrollWidth:", i_actualPageWidth)
-
-                                    flick.contentWidth = Math.max(i_actualPageWidth, flick.width);
-                                })
+                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+                    })
+                    flick.contentWidth = flick.width
                 }
             }
 
@@ -132,11 +126,14 @@ Item {
                     tabletRoot.openBrowserWindow(request, profile);
                 }
             }
-
-            HiFiControls.WebSpinner { }
         }
     }
 
+    HiFiControls.WebSpinner {
+        anchors.centerIn: parent
+        webroot: webroot
+    }
+
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised
@@ -147,5 +144,4 @@ Item {
             bottom: parent.bottom
         }
     }
-
 }
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 6fafab81a9..cf8cdb1773 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -138,8 +138,6 @@ Item {
 
     Flickable {
         id: flick
-        x: 0
-        y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
         anchors.top: buttons.bottom
@@ -206,12 +204,23 @@ Item {
                 }
             }
 
+            onContentsSizeChanged: {
+                flick.contentHeight = Math.max(contentsSize.height, flick.height);
+                flick.contentWidth = flick.width//Math.max(contentsSize.width, flick.width);
+            }
+            //disable popup
+            onContextMenuRequested: {
+                request.accepted = true;
+            }
+
             onLoadingChanged: {
                 keyboardRaised = false;
                 punctuationMode = false;
                 keyboard.resetShiftMode(false);
                 // Required to support clicking on "hifi://" links
                 if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    flick.contentWidth = 0
+                    flick.contentHeight = 0
                     var url = loadRequest.url.toString();
                     if (urlHandler.canHandleUrl(url)) {
                         if (urlHandler.handleUrl(url)) {
@@ -225,8 +234,13 @@ Item {
                 }
 
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
-                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
+                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+                    })
+//                    webroot.runJavaScript("document.body.scrollWidth;", function (i_actualPageWidth) {
+                        flick.contentWidth = flick.width//Math.max(i_actualPageWidth, flick.width);
+//                    })
+
                     webview.forceActiveFocus();
                 }
             }
@@ -234,11 +248,14 @@ Item {
             onNewViewRequested: {
                 request.openIn(webview);
             }
-
-            HiFiControls.WebSpinner { }
         }
     }
 
+    HiFiControls.WebSpinner {
+        webroot: webview
+        anchors.centerIn: parent
+    }
+
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised

From 9fd2a742a925d2fb973731b541345a351c23517e Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 21 Aug 2017 16:45:47 +0200
Subject: [PATCH 28/78] Fix QML warning. Fix AddressBar info scroll

---
 interface/resources/qml/controls/TabletWebView.qml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index cf8cdb1773..12e4a87438 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -11,8 +11,8 @@ import "."
 Item {
     id: web
     HifiConstants { id: hifi }
-    width: parent.width
-    height: parent.height
+    width: parent !== null ? parent.width : undefined
+    height: parent !== null ? parent.height : undefined
     property var parentStackItem: null
     property int headerHeight: 70
     property string url
@@ -206,7 +206,7 @@ Item {
 
             onContentsSizeChanged: {
                 flick.contentHeight = Math.max(contentsSize.height, flick.height);
-                flick.contentWidth = flick.width//Math.max(contentsSize.width, flick.width);
+                flick.contentWidth = flick.width
             }
             //disable popup
             onContextMenuRequested: {
@@ -234,12 +234,10 @@ Item {
                 }
 
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                    webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
                         flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
                     })
-//                    webroot.runJavaScript("document.body.scrollWidth;", function (i_actualPageWidth) {
-                        flick.contentWidth = flick.width//Math.max(i_actualPageWidth, flick.width);
-//                    })
+                    flick.contentWidth = flick.width
 
                     webview.forceActiveFocus();
                 }

From 43d3544a0d6fadabd387dfe8085e8ab5ff26ae45 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 21 Aug 2017 17:07:24 +0200
Subject: [PATCH 29/78] Fix width of html pages in Create mode

---
 interface/resources/qml/controls/WebView.qml | 41 +++++++++-----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 2013de4ef9..91f204bd78 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -4,6 +4,9 @@ import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
 Item {
+    width: parent !== null ? parent.width : undefined
+    height: parent !== null ? parent.height : undefined
+
     property alias url: root.url
     property alias scriptURL: root.userScriptUrl
     property alias canGoBack: root.canGoBack;
@@ -25,12 +28,9 @@ Item {
 
     Flickable {
         id: flick
-        x: 0
-        y: 0
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-
         WebEngineView {
             id: root
             objectName: "webEngineView"
@@ -86,9 +86,13 @@ Item {
 
             onContentsSizeChanged: {
                 console.log("WebView contentsSize", contentsSize)
-                flick.contentWidth = Math.max(contentsSize.width, flick.width)
+                flick.contentWidth = flick.width
                 flick.contentHeight = Math.max(contentsSize.height, flick.height)
             }
+            //disable popup
+            onContextMenuRequested: {
+                request.accepted = true;
+            }
 
             onLoadingChanged: {
                 keyboardRaised = false;
@@ -97,6 +101,8 @@ Item {
 
                 // Required to support clicking on "hifi://" links
                 if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+                    flick.contentWidth = 0
+                    flick.contentHeight = 0
                     var url = loadRequest.url.toString();
                     url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
                     if (urlHandler.canHandleUrl(url)) {
@@ -106,22 +112,10 @@ Item {
                     }
                 }
                 if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-
-//                    flick.contentWidth = Math.max(contentsSize.width, flick.width)
-//                    flick.contentHeight = Math.max(contentsSize.height, flick.height)
-                    root.runJavaScript(
-                                   "document.body.scrollHeight;",
-                                   function (i_actualPageHeight) {
-                                       flick.contentHeight = Math.max (
-                                           i_actualPageHeight, flick.height);
-                                   })
-                               root.runJavaScript(
-                                   "document.body.scrollWidth;",
-                                   function (i_actualPageWidth) {
-                                       flick.contentWidth = Math.max (
-                                           i_actualPageWidth, flick.width);
-                                   })
-
+                    root.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+                    })
+                    flick.contentWidth = flick.width
                 }
             }
 
@@ -133,11 +127,14 @@ Item {
                     tabletRoot.openBrowserWindow(request, profile);
                 }
             }
-
-            HiFiControls.WebSpinner { }
         }
     }
 
+    HiFiControls.WebSpinner {
+        anchors.centerIn: parent
+        webroot: root
+    }
+
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised

From 9185e1d80d23ea1fe4f0b70ca02df80f837c98b1 Mon Sep 17 00:00:00 2001
From: Midnight <midnight@midnightrift.com>
Date: Mon, 21 Aug 2017 14:48:10 -0700
Subject: [PATCH 30/78] code style.

---
 .../marketplace/dodgeBall/dodgeBall.js        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
index 737db9770c..6afb82770f 100644
--- a/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
+++ b/unpublishedScripts/marketplace/dodgeBall/dodgeBall.js
@@ -53,7 +53,7 @@
             azimuthFinish: 180
         };
 
-            particleTrailEntity = Entities.addEntity(props);
+        particleTrailEntity = Entities.addEntity(props);
     }
 
     function particleExplode() {
@@ -93,13 +93,13 @@
             azimuthStart: -180,
             azimuthFinish: 180
         };
-        var exposionParticles = Entities.addEntity(props);
+        var explosionParticles = Entities.addEntity(props);
         Entities.editEntity(_entityID, {
             velocity: Vec3.ZERO,
             dynamic: false
         });
         Script.setTimeout(function () {
-            Entities.deleteEntity(exposionParticles);
+            Entities.deleteEntity(explosionParticles);
             Entities.editEntity(_entityID, {
                 dynamic: true
             })
@@ -114,7 +114,9 @@
             particleTrailEntity = null;
         }
 
-        if (proxTimeout) Script.clearTimeout(proxTimeout);
+        if (proxTimeout) {
+            Script.clearTimeout(proxTimeout);
+        }
     }
 
     function proxCheck() {
@@ -133,7 +135,9 @@
         var avatarUUID = triggerHandAndAvatarUUIDArray[1];
 
         var ballPos = Entities.getEntityProperties(_entityID, ['position']).position;
-        if (Vec3.distance(ballPos, AvatarList.getAvatar(avatarUUID).position) > 2) {
+        var MAX_DISTANCE_GRAB = 2; //meter
+
+        if (Vec3.distance(ballPos, AvatarList.getAvatar(avatarUUID).position) > MAX_DISTANCE_GRAB) {
             Messages.sendMessage(FORCE_DROP_CHANNEL, triggerHand, true);
         }
 
@@ -144,7 +148,9 @@
 
     this.releaseGrab = function (thisEntityID) {
 
-        if (particleTrailEntity === null) particleTrail();
+        if (particleTrailEntity === null) {
+            particleTrail();
+        }
 
         Script.setTimeout(function () {
             proxInterval = Script.setInterval(proxCheck, 50);
@@ -155,7 +161,7 @@
         }, 10000)
     };
 
-    this.collisionWithEntity = function(thisEntityID,  collisionEntityID, collisionInfo) {
+    this.collisionWithEntity = function (thisEntityID, collisionEntityID, collisionInfo) {
         clearProxCheck();
     };
 

From 4be119b729066ebc1b7259179b169e5568fcaa6b Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 23 Aug 2017 14:04:30 -0700
Subject: [PATCH 31/78] make SKIP_TIME work as intended

---
 assignment-client/src/octree/OctreeServer.cpp | 95 +++++++++++--------
 assignment-client/src/octree/OctreeServer.h   |  2 +
 2 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 227f9599e3..55fc405d1b 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -37,6 +37,8 @@
 int OctreeServer::_clientCount = 0;
 const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000000;
 
+float OctreeServer::SKIP_TIME = -1.0f; // use this for trackXXXTime() calls for non-times
+
 SimpleMovingAverage OctreeServer::_averageLoopTime(MOVING_AVERAGE_SAMPLE_COUNTS);
 SimpleMovingAverage OctreeServer::_averageInsideTime(MOVING_AVERAGE_SAMPLE_COUNTS);
 
@@ -132,81 +134,90 @@ void OctreeServer::trackEncodeTime(float time) {
     const float MAX_SHORT_TIME = 10.0f;
     const float MAX_LONG_TIME = 100.0f;
 
-    if (time == 0.0f) {
+    if (time == SKIP_TIME) {
         _noEncode++;
-    } else if (time <= MAX_SHORT_TIME) {
-        _shortEncode++;
-        _averageShortEncodeTime.updateAverage(time);
-    } else if (time <= MAX_LONG_TIME) {
-        _longEncode++;
-        _averageLongEncodeTime.updateAverage(time);
     } else {
-        _extraLongEncode++;
-        _averageExtraLongEncodeTime.updateAverage(time);
+        if (time <= MAX_SHORT_TIME) {
+            _shortEncode++;
+            _averageShortEncodeTime.updateAverage(time);
+        } else if (time <= MAX_LONG_TIME) {
+            _longEncode++;
+            _averageLongEncodeTime.updateAverage(time);
+        } else {
+            _extraLongEncode++;
+            _averageExtraLongEncodeTime.updateAverage(time);
+        }
+        _averageEncodeTime.updateAverage(time);
     }
-    _averageEncodeTime.updateAverage(time);
 }
 
 void OctreeServer::trackTreeWaitTime(float time) {
     const float MAX_SHORT_TIME = 10.0f;
     const float MAX_LONG_TIME = 100.0f;
-    if (time == 0.0f) {
+    if (time == SKIP_TIME) {
         _noTreeWait++;
-    } else if (time <= MAX_SHORT_TIME) {
-        _shortTreeWait++;
-        _averageTreeShortWaitTime.updateAverage(time);
-    } else if (time <= MAX_LONG_TIME) {
-        _longTreeWait++;
-        _averageTreeLongWaitTime.updateAverage(time);
     } else {
-        _extraLongTreeWait++;
-        _averageTreeExtraLongWaitTime.updateAverage(time);
+        if (time <= MAX_SHORT_TIME) {
+            _shortTreeWait++;
+            _averageTreeShortWaitTime.updateAverage(time);
+        } else if (time <= MAX_LONG_TIME) {
+            _longTreeWait++;
+            _averageTreeLongWaitTime.updateAverage(time);
+        } else {
+            _extraLongTreeWait++;
+            _averageTreeExtraLongWaitTime.updateAverage(time);
+        }
+        _averageTreeWaitTime.updateAverage(time);
     }
-    _averageTreeWaitTime.updateAverage(time);
 }
 
 void OctreeServer::trackCompressAndWriteTime(float time) {
     const float MAX_SHORT_TIME = 10.0f;
     const float MAX_LONG_TIME = 100.0f;
-    if (time == 0.0f) {
+    if (time == SKIP_TIME) {
         _noCompress++;
-    } else if (time <= MAX_SHORT_TIME) {
-        _shortCompress++;
-        _averageShortCompressTime.updateAverage(time);
-    } else if (time <= MAX_LONG_TIME) {
-        _longCompress++;
-        _averageLongCompressTime.updateAverage(time);
     } else {
-        _extraLongCompress++;
-        _averageExtraLongCompressTime.updateAverage(time);
+        if (time <= MAX_SHORT_TIME) {
+            _shortCompress++;
+            _averageShortCompressTime.updateAverage(time);
+        } else if (time <= MAX_LONG_TIME) {
+            _longCompress++;
+            _averageLongCompressTime.updateAverage(time);
+        } else {
+            _extraLongCompress++;
+            _averageExtraLongCompressTime.updateAverage(time);
+        }
+        _averageCompressAndWriteTime.updateAverage(time);
     }
-    _averageCompressAndWriteTime.updateAverage(time);
 }
 
 void OctreeServer::trackPacketSendingTime(float time) {
-    if (time == 0.0f) {
+    if (time == SKIP_TIME) {
         _noSend++;
+    } else {
+        _averagePacketSendingTime.updateAverage(time);
     }
-    _averagePacketSendingTime.updateAverage(time);
 }
 
 
 void OctreeServer::trackProcessWaitTime(float time) {
     const float MAX_SHORT_TIME = 10.0f;
     const float MAX_LONG_TIME = 100.0f;
-    if (time == 0.0f) {
+    if (time == SKIP_TIME) {
         _noProcessWait++;
-    } else if (time <= MAX_SHORT_TIME) {
-        _shortProcessWait++;
-        _averageProcessShortWaitTime.updateAverage(time);
-    } else if (time <= MAX_LONG_TIME) {
-        _longProcessWait++;
-        _averageProcessLongWaitTime.updateAverage(time);
     } else {
-        _extraLongProcessWait++;
-        _averageProcessExtraLongWaitTime.updateAverage(time);
+        if (time <= MAX_SHORT_TIME) {
+            _shortProcessWait++;
+            _averageProcessShortWaitTime.updateAverage(time);
+        } else if (time <= MAX_LONG_TIME) {
+            _longProcessWait++;
+            _averageProcessLongWaitTime.updateAverage(time);
+        } else {
+            _extraLongProcessWait++;
+            _averageProcessExtraLongWaitTime.updateAverage(time);
+        }
+        _averageProcessWaitTime.updateAverage(time);
     }
-    _averageProcessWaitTime.updateAverage(time);
 }
 
 OctreeServer::OctreeServer(ReceivedMessage& message) :
diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h
index ab2ef30da1..5043ea681c 100644
--- a/assignment-client/src/octree/OctreeServer.h
+++ b/assignment-client/src/octree/OctreeServer.h
@@ -82,6 +82,8 @@ public:
     virtual void trackSend(const QUuid& dataID, quint64 dataLastEdited, const QUuid& viewerNode) { }
     virtual void trackViewerGone(const QUuid& viewerNode) { }
 
+    static float SKIP_TIME; // use this for trackXXXTime() calls for non-times
+
     static void trackLoopTime(float time) { _averageLoopTime.updateAverage(time); }
     static float getAverageLoopTime() { return _averageLoopTime.getAverage(); }
 

From 45f194f6bc18dc9bcae1974721b9ec284878c77f Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 23 Aug 2017 14:05:05 -0700
Subject: [PATCH 32/78] use SKIP_TIME again instead of 0.0

---
 assignment-client/src/octree/OctreeSendThread.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 9e37be4b4e..9345f96b1d 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -480,6 +480,9 @@ bool OctreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstreamPara
         });
 
         OctreeServer::trackEncodeTime((float)(usecTimestampNow() - encodeStart));
+    } else {
+        OctreeServer::trackTreeWaitTime(OctreeServer::SKIP_TIME);
+        OctreeServer::trackEncodeTime(OctreeServer::SKIP_TIME);
     }
     return somethingToSend;
 }
@@ -512,8 +515,8 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
     bool somethingToSend = true; // assume we have something
     bool bagHadSomething = !nodeData->elementBag.isEmpty();
     while (somethingToSend && _packetsSentThisInterval < maxPacketsPerInterval && !nodeData->isShuttingDown()) {
-        float compressAndWriteElapsedUsec = 0.0f;
-        float packetSendingElapsedUsec = 0.0f;
+        float compressAndWriteElapsedUsec = OctreeServer::SKIP_TIME;
+        float packetSendingElapsedUsec = OctreeServer::SKIP_TIME;
 
         quint64 startInside = usecTimestampNow();
 
@@ -568,11 +571,6 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
             }
             _packetData.changeSettings(true, targetSize); // will do reset - NOTE: Always compressed
         }
-        if (!somethingToSend) {
-            // these stats were not updated so we record zero to record this fact
-            OctreeServer::trackTreeWaitTime(0.0f);
-            OctreeServer::trackEncodeTime(0.0f);
-        }
         OctreeServer::trackCompressAndWriteTime(compressAndWriteElapsedUsec);
         OctreeServer::trackPacketSendingTime(packetSendingElapsedUsec);
         OctreeServer::trackInsideTime((float)(usecTimestampNow() - startInside));

From c7fe845403720c3f175b8f1ca4deb6e8f24e328d Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Thu, 24 Aug 2017 21:35:47 +0200
Subject: [PATCH 33/78] Move common webview flickable code to separate core
 file

---
 interface/resources/qml/TabletBrowser.qml     |   4 +-
 .../qml/controls-uit/BaseWebView.qml          |   2 +-
 .../resources/qml/controls-uit/WebSpinner.qml |   6 +-
 .../qml/controls/TabletWebScreen.qml          | 230 ++++++++-------
 .../resources/qml/controls/TabletWebView.qml  | 271 ++++++++++--------
 interface/resources/qml/controls/WebView.qml  | 236 ++++++++-------
 6 files changed, 409 insertions(+), 340 deletions(-)

diff --git a/interface/resources/qml/TabletBrowser.qml b/interface/resources/qml/TabletBrowser.qml
index 0b06a6e2a1..ce74ae8c6e 100644
--- a/interface/resources/qml/TabletBrowser.qml
+++ b/interface/resources/qml/TabletBrowser.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtWebChannel 1.0
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 
 import "controls"
 import "controls-uit" as HifiControls
@@ -17,7 +17,7 @@ Item {
     height: 600
     property variant permissionsBar: {'securityOrigin':'none','feature':'none'}
     property alias url: webview.url
-    property WebEngineView webView: webview
+    //property WebEngineView webView: webview
     property bool canGoBack: webview.canGoBack
     property bool canGoForward: webview.canGoForward
 
diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controls-uit/BaseWebView.qml
index 3ca57f03bf..660f52d529 100644
--- a/interface/resources/qml/controls-uit/BaseWebView.qml
+++ b/interface/resources/qml/controls-uit/BaseWebView.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import QtWebEngine 1.2
+import QtWebEngine 1.5
 
 WebEngineView {
     id: root
diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controls-uit/WebSpinner.qml
index 3e7ca6ec22..e8e01c4865 100644
--- a/interface/resources/qml/controls-uit/WebSpinner.qml
+++ b/interface/resources/qml/controls-uit/WebSpinner.qml
@@ -9,11 +9,13 @@
 //
 
 import QtQuick 2.5
+import QtWebEngine 1.5
 
 AnimatedImage {
-    property Item webroot: parent
+    property WebEngineView webview: parent
     source: "../../icons/loader-snake-64-w.gif"
-    visible: webroot.loading && /^(http.*|)$/i.test(webroot.url.toString())
+    visible: webview.loading && /^(http.*|)$/i.test(webview.url.toString())
+    playing: visible
     z: 10000
     anchors {
         horizontalCenter: parent.horizontalCenter
diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index eeb211a16d..665ce7ea27 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -1,6 +1,4 @@
 import QtQuick 2.7
-import QtWebEngine 1.5
-import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
 Item {
@@ -8,7 +6,7 @@ Item {
     property alias url: webroot.url
     property alias scriptURL: webroot.userScriptUrl
     property alias canGoBack: webroot.canGoBack;
-    property var goBack: webroot.goBack;
+    property var goBack: webroot.webViewCore.goBack;
     property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
@@ -22,117 +20,139 @@ Item {
     }
     */
 
-    property alias viewProfile: webroot.profile
+    property alias viewProfile: webroot.webViewCoreProfile
 
-    Flickable {
-        id: flick
+    FlickableWebViewCore {
+        id: webroot
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        WebEngineView {
-            id: webroot
-            objectName: "webEngineView"
-            anchors.fill: parent
+        onLoadingChangedCallback: {
+            keyboardRaised = false;
+            punctuationMode = false;
+            keyboard.resetShiftMode(false);
+        }
 
-            profile: HFWebEngineProfile;
-
-            property string userScriptUrl: ""
-
-            // creates a global EventBridge object.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // detects when to raise and lower virtual keyboard
-            WebEngineScript {
-                id: raiseAndLowerKeyboard
-                injectionPoint: WebEngineScript.Deferred
-                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // User script.
-            WebEngineScript {
-                id: userScript
-                sourceUrl: webroot.userScriptUrl
-                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-                worldId: WebEngineScript.MainWorld
-            }
-
-            property string urlTag: "noDownload=false";
-
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-            property string newUrl: ""
-
-            //disable popup
-            onContextMenuRequested: {
-                request.accepted = true;
-            }
-
-            onContentsSizeChanged: {
-                flick.contentHeight = Math.max(contentsSize.height, flick.height);
-                flick.contentWidth = flick.width
-            }
-
-            Component.onCompleted: {
-                webChannel.registerObject("eventBridge", eventBridge);
-                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-                // Ensure the JS from the web-engine makes it to our logging
-                webroot.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-                });
-
-                webroot.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
-            }
-
-            onFeaturePermissionRequested: {
-                grantFeaturePermission(securityOrigin, feature, true);
-            }
-
-            onLoadingChanged: {
-                keyboardRaised = false;
-                punctuationMode = false;
-                keyboard.resetShiftMode(false);
-
-                // Required to support clicking on "hifi://" links
-                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                    flick.contentWidth = 0
-                    flick.contentHeight = 0
-                    var url = loadRequest.url.toString();
-                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                    if (urlHandler.canHandleUrl(url)) {
-                        if (urlHandler.handleUrl(url)) {
-                            webroot.stop();
-                        }
-                    }
-                }
-                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-                    })
-                    flick.contentWidth = flick.width
-                }
-            }
-
-            onNewViewRequested:{
-                // desktop is not defined for web-entities or tablet
-                if (typeof desktop !== "undefined") {
-                    desktop.openBrowserWindow(request, profile);
-                } else {
-                    tabletRoot.openBrowserWindow(request, profile);
-                }
+        onNewViewRequestedCallback: {
+            // desktop is not defined for web-entities or tablet
+            if (typeof desktop !== "undefined") {
+                desktop.openBrowserWindow(request, profile);
+            } else {
+                tabletRoot.openBrowserWindow(request, profile);
             }
         }
+
     }
 
-    HiFiControls.WebSpinner {
-        anchors.centerIn: parent
-        webroot: webroot
-    }
+//    Flickable {
+//        id: flick
+//        width: parent.width
+//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
+
+//        WebEngineView {
+//            id: webroot
+//            objectName: "webEngineView"
+//            anchors.fill: parent
+
+//            profile: HFWebEngineProfile;
+
+//            property string userScriptUrl: ""
+
+//            // creates a global EventBridge object.
+//            WebEngineScript {
+//                id: createGlobalEventBridge
+//                sourceCode: eventBridgeJavaScriptToInject
+//                injectionPoint: WebEngineScript.DocumentCreation
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // detects when to raise and lower virtual keyboard
+//            WebEngineScript {
+//                id: raiseAndLowerKeyboard
+//                injectionPoint: WebEngineScript.Deferred
+//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // User script.
+//            WebEngineScript {
+//                id: userScript
+//                sourceUrl: webroot.userScriptUrl
+//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            property string urlTag: "noDownload=false";
+
+//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+//            property string newUrl: ""
+
+//            //disable popup
+//            onContextMenuRequested: {
+//                request.accepted = true;
+//            }
+
+//            onContentsSizeChanged: {
+//                flick.contentHeight = Math.max(contentsSize.height, flick.height);
+//                flick.contentWidth = flick.width
+//            }
+
+//            Component.onCompleted: {
+//                webChannel.registerObject("eventBridge", eventBridge);
+//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+//                // Ensure the JS from the web-engine makes it to our logging
+//                webroot.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+//                });
+
+//                webroot.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
+//            }
+
+//            onFeaturePermissionRequested: {
+//                grantFeaturePermission(securityOrigin, feature, true);
+//            }
+
+//            onLoadingChanged: {
+//                keyboardRaised = false;
+//                punctuationMode = false;
+//                keyboard.resetShiftMode(false);
+
+//                // Required to support clicking on "hifi://" links
+//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+//                    flick.contentWidth = 0
+//                    flick.contentHeight = 0
+//                    var url = loadRequest.url.toString();
+//                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
+//                    if (urlHandler.canHandleUrl(url)) {
+//                        if (urlHandler.handleUrl(url)) {
+//                            webroot.stop();
+//                        }
+//                    }
+//                }
+//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+//                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+//                    })
+//                    flick.contentWidth = flick.width
+//                }
+//            }
+
+//            onNewViewRequested:{
+//                // desktop is not defined for web-entities or tablet
+//                if (typeof desktop !== "undefined") {
+//                    desktop.openBrowserWindow(request, profile);
+//                } else {
+//                    tabletRoot.openBrowserWindow(request, profile);
+//                }
+//            }
+//        }
+//    }
+
+//    HiFiControls.WebSpinner {
+//        anchors.centerIn: parent
+//        webroot: webroot
+//    }
 
     HiFiControls.Keyboard {
         id: keyboard
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 12e4a87438..626773907c 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,15 +1,15 @@
 import QtQuick 2.7
-import QtQuick.Controls 1.4
+//import QtQuick.Controls 1.4
 import QtWebEngine 1.5
-import QtWebChannel 1.0
+//import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 import "../styles" as HifiStyles
 import "../styles-uit"
-import "../"
-import "."
+//import "../"
+//import "."
 
 Item {
-    id: web
+    id: root
     HifiConstants { id: hifi }
     width: parent !== null ? parent.width : undefined
     height: parent !== null ? parent.height : undefined
@@ -21,8 +21,8 @@ Item {
     property bool keyboardRaised: false
     property bool punctuationMode: false
     property bool isDesktop: false
-    property alias webView: webview
-    property alias profile: webview.profile
+    property alias webView: web.webViewCore
+    property alias profile: web.webViewCoreProfile
     property bool remove: false
     property bool closeButtonVisible: true
 
@@ -79,7 +79,7 @@ Item {
             color: hifi.colors.baseGray
             font.pixelSize: 12
             verticalAlignment: Text.AlignLeft
-            text: webview.url
+            text: root.url
             anchors {
                 top: nav.bottom
                 horizontalCenter: parent.horizontalCenter;
@@ -104,13 +104,13 @@ Item {
 
     function closeWebEngine() {
         if (remove) {
-            web.destroy();
+            root.destroy();
             return;
         }
         if (parentStackItem) {
             parentStackItem.pop();
         } else {
-            web.visible = false;
+            root.visible = false;
         }
     }
 
@@ -128,131 +128,160 @@ Item {
     }
 
     function loadUrl(url) {
-        webview.url = url
-        web.url = webview.url;
+        web.webViewCore.url = url
+        root.url = web.webViewCore.url;
     }
 
     onUrlChanged: {
         loadUrl(url);
     }
 
-    Flickable {
-        id: flick
+    FlickableWebViewCore {
+        id: web
         width: parent.width
-        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
+        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - root.headerHeight : parent.height - root.headerHeight
         anchors.top: buttons.bottom
 
-        WebEngineView {
-            id: webview
-            objectName: "webEngineView"
-            anchors.fill: parent
-
-            profile: HFWebEngineProfile;
-
-            property string userScriptUrl: ""
-
-            // creates a global EventBridge object.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
-                worldId: WebEngineScript.MainWorld
+        onUrlChanged: {
+            // Record history, skipping null and duplicate items.
+            var urlString = url + "";
+            urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
+            if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
+                historyIndex++;
+                history = history.slice(0, historyIndex);
+                history.push(urlString);
             }
+        }
 
-            // detects when to raise and lower virtual keyboard
-            WebEngineScript {
-                id: raiseAndLowerKeyboard
-                injectionPoint: WebEngineScript.Deferred
-                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-                worldId: WebEngineScript.MainWorld
-            }
+        onLoadingChangedCallback: {
+            keyboardRaised = false;
+            punctuationMode = false;
+            keyboard.resetShiftMode(false);
+            webViewCore.forceActiveFocus();
+        }
 
-            // User script.
-            WebEngineScript {
-                id: userScript
-                sourceUrl: webview.userScriptUrl
-                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-                worldId: WebEngineScript.MainWorld
-            }
-
-            property string urlTag: "noDownload=false";
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-            property string newUrl: ""
-
-            Component.onCompleted: {
-                webChannel.registerObject("eventBridge", eventBridge);
-                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-                // Ensure the JS from the web-engine makes it to our logging
-                webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-                });
-            }
-
-            onFeaturePermissionRequested: {
-                grantFeaturePermission(securityOrigin, feature, true);
-            }
-
-            onUrlChanged: {
-                // Record history, skipping null and duplicate items.
-                var urlString = url + "";
-                urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
-                if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
-                    historyIndex++;
-                    history = history.slice(0, historyIndex);
-                    history.push(urlString);
-                }
-            }
-
-            onContentsSizeChanged: {
-                flick.contentHeight = Math.max(contentsSize.height, flick.height);
-                flick.contentWidth = flick.width
-            }
-            //disable popup
-            onContextMenuRequested: {
-                request.accepted = true;
-            }
-
-            onLoadingChanged: {
-                keyboardRaised = false;
-                punctuationMode = false;
-                keyboard.resetShiftMode(false);
-                // Required to support clicking on "hifi://" links
-                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                    flick.contentWidth = 0
-                    flick.contentHeight = 0
-                    var url = loadRequest.url.toString();
-                    if (urlHandler.canHandleUrl(url)) {
-                        if (urlHandler.handleUrl(url)) {
-                            root.stop();
-                        }
-                    }
-                }
-
-                if (WebEngineView.LoadFailedStatus == loadRequest.status) {
-                    console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
-                }
-
-                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-                    })
-                    flick.contentWidth = flick.width
-
-                    webview.forceActiveFocus();
-                }
-            }
-
-            onNewViewRequested: {
-                request.openIn(webview);
-            }
+        onNewViewRequestedCallback: {
+            request.openIn(webViewCore);
         }
     }
 
-    HiFiControls.WebSpinner {
-        webroot: webview
-        anchors.centerIn: parent
-    }
+//    Flickable {
+//        id: flick
+//        width: parent.width
+//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
+//        anchors.top: buttons.bottom
+
+//        WebEngineView {
+//            id: webview
+//            objectName: "webEngineView"
+//            anchors.fill: parent
+
+//            profile: HFWebEngineProfile;
+
+//            property string userScriptUrl: ""
+
+//            // creates a global EventBridge object.
+//            WebEngineScript {
+//                id: createGlobalEventBridge
+//                sourceCode: eventBridgeJavaScriptToInject
+//                injectionPoint: WebEngineScript.DocumentCreation
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // detects when to raise and lower virtual keyboard
+//            WebEngineScript {
+//                id: raiseAndLowerKeyboard
+//                injectionPoint: WebEngineScript.Deferred
+//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // User script.
+//            WebEngineScript {
+//                id: userScript
+//                sourceUrl: webview.userScriptUrl
+//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            property string urlTag: "noDownload=false";
+//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+//            property string newUrl: ""
+
+//            Component.onCompleted: {
+//                webChannel.registerObject("eventBridge", eventBridge);
+//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+//                // Ensure the JS from the web-engine makes it to our logging
+//                webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+//                });
+//            }
+
+//            onFeaturePermissionRequested: {
+//                grantFeaturePermission(securityOrigin, feature, true);
+//            }
+
+//            onUrlChanged: {
+//                // Record history, skipping null and duplicate items.
+//                var urlString = url + "";
+//                urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
+//                if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
+//                    historyIndex++;
+//                    history = history.slice(0, historyIndex);
+//                    history.push(urlString);
+//                }
+//            }
+
+//            onContentsSizeChanged: {
+//                flick.contentHeight = Math.max(contentsSize.height, flick.height);
+//                flick.contentWidth = flick.width
+//            }
+//            //disable popup
+//            onContextMenuRequested: {
+//                request.accepted = true;
+//            }
+
+//            onLoadingChanged: {
+//                keyboardRaised = false;
+//                punctuationMode = false;
+//                keyboard.resetShiftMode(false);
+//                // Required to support clicking on "hifi://" links
+//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+//                    flick.contentWidth = 0
+//                    flick.contentHeight = 0
+//                    var url = loadRequest.url.toString();
+//                    if (urlHandler.canHandleUrl(url)) {
+//                        if (urlHandler.handleUrl(url)) {
+//                            root.stop();
+//                        }
+//                    }
+//                }
+
+//                if (WebEngineView.LoadFailedStatus == loadRequest.status) {
+//                    console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+//                }
+
+//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+//                    webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+//                    })
+//                    flick.contentWidth = flick.width
+
+//                    webview.forceActiveFocus();
+//                }
+//            }
+
+//            onNewViewRequested: {
+//                request.openIn(webview);
+//            }
+//        }
+//    }
+
+//    HiFiControls.WebSpinner {
+//        webview: webview
+//        anchors.centerIn: parent
+//    }
 
     HiFiControls.Keyboard {
         id: keyboard
@@ -267,7 +296,7 @@ Item {
     }
     
     Component.onCompleted: {
-        web.isDesktop = (typeof desktop !== "undefined");
+        root.isDesktop = (typeof desktop !== "undefined");
         keyboardEnabled = HMD.active;
     }
 
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 91f204bd78..b4ec41ec9c 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -1,17 +1,15 @@
 import QtQuick 2.7
-import QtWebEngine 1.5
-import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 
 Item {
     width: parent !== null ? parent.width : undefined
     height: parent !== null ? parent.height : undefined
 
-    property alias url: root.url
-    property alias scriptURL: root.userScriptUrl
-    property alias canGoBack: root.canGoBack;
-    property var goBack: root.goBack;
-    property alias urlTag: root.urlTag
+    property alias url: webroot.url
+    property alias scriptURL: webroot.userScriptUrl
+    property alias canGoBack: webroot.canGoBack;
+    property var goBack: webroot.webViewCore.goBack;
+    property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
     property bool punctuationMode: false
@@ -24,116 +22,137 @@ Item {
     }
     */
 
-    property alias viewProfile: root.profile
+    property alias viewProfile: webroot.webViewCoreProfile
 
-    Flickable {
-        id: flick
+    FlickableWebViewCore {
+        id: webroot
         width: parent.width
         height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
 
-        WebEngineView {
-            id: root
-            objectName: "webEngineView"
-            anchors.fill: parent
+        onLoadingChangedCallback: {
+            keyboardRaised = false;
+            punctuationMode = false;
+            keyboard.resetShiftMode(false);
+        }
 
-            profile: HFWebEngineProfile;
-
-            property string userScriptUrl: ""
-
-            // creates a global EventBridge object.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // detects when to raise and lower virtual keyboard
-            WebEngineScript {
-                id: raiseAndLowerKeyboard
-                injectionPoint: WebEngineScript.Deferred
-                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // User script.
-            WebEngineScript {
-                id: userScript
-                sourceUrl: root.userScriptUrl
-                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-                worldId: WebEngineScript.MainWorld
-            }
-
-            property string urlTag: "noDownload=false";
-
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-            property string newUrl: ""
-
-            Component.onCompleted: {
-                webChannel.registerObject("eventBridge", eventBridge);
-                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-                // Ensure the JS from the web-engine makes it to our logging
-                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-                });
-
-            }
-
-            onFeaturePermissionRequested: {
-                grantFeaturePermission(securityOrigin, feature, true);
-            }
-
-            onContentsSizeChanged: {
-                console.log("WebView contentsSize", contentsSize)
-                flick.contentWidth = flick.width
-                flick.contentHeight = Math.max(contentsSize.height, flick.height)
-            }
-            //disable popup
-            onContextMenuRequested: {
-                request.accepted = true;
-            }
-
-            onLoadingChanged: {
-                keyboardRaised = false;
-                punctuationMode = false;
-                keyboard.resetShiftMode(false);
-
-                // Required to support clicking on "hifi://" links
-                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-                    flick.contentWidth = 0
-                    flick.contentHeight = 0
-                    var url = loadRequest.url.toString();
-                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-                    if (urlHandler.canHandleUrl(url)) {
-                        if (urlHandler.handleUrl(url)) {
-                            root.stop();
-                        }
-                    }
-                }
-                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-                    root.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-                    })
-                    flick.contentWidth = flick.width
-                }
-            }
-
-            onNewViewRequested:{
-                // desktop is not defined for web-entities or tablet
-                if (typeof desktop !== "undefined") {
-                    desktop.openBrowserWindow(request, profile);
-                } else {
-                    tabletRoot.openBrowserWindow(request, profile);
-                }
+        onNewViewRequestedCallback: {
+            // desktop is not defined for web-entities or tablet
+            if (typeof desktop !== "undefined") {
+                desktop.openBrowserWindow(request, profile);
+            } else {
+                tabletRoot.openBrowserWindow(request, profile);
             }
         }
     }
 
-    HiFiControls.WebSpinner {
-        anchors.centerIn: parent
-        webroot: root
-    }
+//    Flickable {
+//        id: flick
+//        width: parent.width
+//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
+
+//        WebEngineView {
+//            id: root
+//            objectName: "webEngineView"
+//            anchors.fill: parent
+
+//            profile: HFWebEngineProfile;
+
+//            property string userScriptUrl: ""
+
+//            // creates a global EventBridge object.
+//            WebEngineScript {
+//                id: createGlobalEventBridge
+//                sourceCode: eventBridgeJavaScriptToInject
+//                injectionPoint: WebEngineScript.DocumentCreation
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // detects when to raise and lower virtual keyboard
+//            WebEngineScript {
+//                id: raiseAndLowerKeyboard
+//                injectionPoint: WebEngineScript.Deferred
+//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            // User script.
+//            WebEngineScript {
+//                id: userScript
+//                sourceUrl: root.userScriptUrl
+//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+//                worldId: WebEngineScript.MainWorld
+//            }
+
+//            property string urlTag: "noDownload=false";
+
+//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+//            property string newUrl: ""
+
+//            Component.onCompleted: {
+//                webChannel.registerObject("eventBridge", eventBridge);
+//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+//                // Ensure the JS from the web-engine makes it to our logging
+//                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+//                });
+
+//            }
+
+//            onFeaturePermissionRequested: {
+//                grantFeaturePermission(securityOrigin, feature, true);
+//            }
+
+//            onContentsSizeChanged: {
+//                console.log("WebView contentsSize", contentsSize)
+//                flick.contentWidth = flick.width
+//                flick.contentHeight = Math.max(contentsSize.height, flick.height)
+//            }
+//            //disable popup
+//            onContextMenuRequested: {
+//                request.accepted = true;
+//            }
+
+//            onLoadingChanged: {
+//                keyboardRaised = false;
+//                punctuationMode = false;
+//                keyboard.resetShiftMode(false);
+
+//                // Required to support clicking on "hifi://" links
+//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+//                    flick.contentWidth = 0
+//                    flick.contentHeight = 0
+//                    var url = loadRequest.url.toString();
+//                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
+//                    if (urlHandler.canHandleUrl(url)) {
+//                        if (urlHandler.handleUrl(url)) {
+//                            root.stop();
+//                        }
+//                    }
+//                }
+//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
+//                    root.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+//                    })
+//                    flick.contentWidth = flick.width
+//                }
+//            }
+
+//            onNewViewRequested:{
+//                // desktop is not defined for web-entities or tablet
+//                if (typeof desktop !== "undefined") {
+//                    desktop.openBrowserWindow(request, profile);
+//                } else {
+//                    tabletRoot.openBrowserWindow(request, profile);
+//                }
+//            }
+//        }
+//    }
+
+//    HiFiControls.WebSpinner {
+//        anchors.centerIn: parent
+//        webroot: root
+//    }
 
     HiFiControls.Keyboard {
         id: keyboard
@@ -145,5 +164,4 @@ Item {
             bottom: parent.bottom
         }
     }
-
 }

From d6b914283c4a12d8d00526568386830345725b60 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 24 Aug 2017 13:56:34 -0700
Subject: [PATCH 34/78] use sane running average window

---
 assignment-client/src/octree/OctreeServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 55fc405d1b..974f00326b 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -35,7 +35,7 @@
 #include <QtCore/QDir>
 
 int OctreeServer::_clientCount = 0;
-const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000000;
+const int MOVING_AVERAGE_SAMPLE_COUNTS = 1000;
 
 float OctreeServer::SKIP_TIME = -1.0f; // use this for trackXXXTime() calls for non-times
 

From d6079e70fbcd4a1a708cbb624a94199ad7fb1a00 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Thu, 24 Aug 2017 23:44:53 +0200
Subject: [PATCH 35/78] Binding to width to make sure it will follow Tablet
 with when rotating

---
 .../qml/controls/FlickableWebViewCore.qml     | 124 ++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 interface/resources/qml/controls/FlickableWebViewCore.qml

diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
new file mode 100644
index 0000000000..7706eb1102
--- /dev/null
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -0,0 +1,124 @@
+import QtQuick 2.7
+import QtWebEngine 1.5
+import QtWebChannel 1.0
+
+Flickable {
+    id: flick
+
+    property alias url: _webview.url
+    property alias canGoBack: _webview.canGoBack
+    property alias webViewCore: _webview
+    property alias webViewCoreProfile: _webview.profile
+
+    property string userScriptUrl: ""
+    property string urlTag: "noDownload=false";
+
+    signal newViewRequestedCallback(var request)
+    signal loadingChangedCallback(var loadRequest)
+
+    function onLoadingChanged(loadRequest) {
+        // Required to support clicking on "hifi://" links
+        if (WebEngineView.LoadStartedStatus === loadRequest.status) {
+            flick.contentWidth = 0
+            flick.contentHeight = 0
+            var url = loadRequest.url.toString();
+            if (urlHandler.canHandleUrl(url)) {
+                if (urlHandler.handleUrl(url)) {
+                    _webview.stop();
+                }
+            }
+        }
+
+        if (WebEngineView.LoadFailedStatus === loadRequest.status) {
+            console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+        }
+
+        if (WebEngineView.LoadSucceededStatus === loadRequest.status) {
+            _webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
+                flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+            })
+            flick.contentWidth = flick.width
+        }
+    }
+
+    WebEngineView {
+        id: _webview
+
+        height: parent.height
+
+        profile: HFWebEngineProfile;
+
+        // creates a global EventBridge object.
+        WebEngineScript {
+            id: createGlobalEventBridge
+            sourceCode: eventBridgeJavaScriptToInject
+            injectionPoint: WebEngineScript.DocumentCreation
+            worldId: WebEngineScript.MainWorld
+        }
+
+        // detects when to raise and lower virtual keyboard
+        WebEngineScript {
+            id: raiseAndLowerKeyboard
+            injectionPoint: WebEngineScript.Deferred
+            sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
+            worldId: WebEngineScript.MainWorld
+        }
+
+        // User script.
+        WebEngineScript {
+            id: userScript
+            sourceUrl: flick.userScriptUrl
+            injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
+            worldId: WebEngineScript.MainWorld
+        }
+
+        userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
+
+        property string newUrl: ""
+
+        Component.onCompleted: {
+            width = Qt.binding(function() { return flick.width; });
+
+            webChannel.registerObject("eventBridge", eventBridge);
+            webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
+            // Ensure the JS from the web-engine makes it to our logging
+            _webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
+                console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
+            });
+            _webview.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
+
+        }
+
+        onFeaturePermissionRequested: {
+            grantFeaturePermission(securityOrigin, feature, true);
+        }
+
+        onContentsSizeChanged: {
+            flick.contentHeight = Math.max(contentsSize.height, flick.height);
+            flick.contentWidth = flick.width
+        }
+        //disable popup
+        onContextMenuRequested: {
+            request.accepted = true;
+        }
+
+        onNewViewRequested: {
+            newViewRequestedCallback(request)
+        }
+
+        onLoadingChanged: {
+            flick.onLoadingChanged(loadRequest)
+            loadingChangedCallback(loadRequest)
+        }
+    }
+
+    AnimatedImage {
+        //anchoring doesnt works here when changing content size
+        x: flick.width/2 - width/2
+        y: flick.height/2 - height/2
+        source: "../../icons/loader-snake-64-w.gif"
+        visible: _webview.loading && /^(http.*|)$/i.test(_webview.url.toString())
+        playing: visible
+        z: 10000
+    }
+}

From c7affea41193c0ec4373f1e2cbe39810a99221ae Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 24 Aug 2017 16:40:16 -0700
Subject: [PATCH 36/78] add a timeout for ICE server DNS lookup

---
 domain-server/src/DomainServer.cpp | 19 ++++++++++++++++++-
 domain-server/src/DomainServer.h   |  6 +++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 163bd48f1b..d9de9fe963 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -711,8 +711,25 @@ void DomainServer::setupICEHeartbeatForFullNetworking() {
 }
 
 void DomainServer::updateICEServerAddresses() {
-    if (_iceAddressLookupID == -1) {
+    if (_iceAddressLookupID == INVALID_ICE_LOOKUP_ID) {
         _iceAddressLookupID = QHostInfo::lookupHost(_iceServerAddr, this, SLOT(handleICEHostInfo(QHostInfo)));
+
+        // there seems to be a 5.9 bug where lookupHost never calls our slot
+        // so we add a single shot manual "timeout" to fire it off again if it hasn't called back yet
+        static const int ICE_ADDRESS_LOOKUP_TIMEOUT_MS = 5000;
+        QTimer::singleShot(ICE_ADDRESS_LOOKUP_TIMEOUT_MS, this, &DomainServer::timeoutICEAddressLookup);
+    }
+}
+
+void DomainServer::timeoutICEAddressLookup() {
+    if (_iceAddressLookupID != INVALID_ICE_LOOKUP_ID) {
+        // we waited 5s and didn't hear back for our ICE DNS lookup
+        // so time that one out and kick off another
+        QHostInfo::abortHostLookup(_iceAddressLookupID);
+
+        _iceAddressLookupID = INVALID_ICE_LOOKUP_ID;
+
+        updateICEServerAddresses();
     }
 }
 
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 4808297c89..ac57375407 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -39,6 +39,8 @@ typedef QMultiHash<QUuid, WalletTransaction*> TransactionHash;
 using Subnet = QPair<QHostAddress, int>;
 using SubnetList = std::vector<Subnet>;
 
+const int INVALID_ICE_LOOKUP_ID = -1;
+
 enum ReplicationServerDirection {
     Upstream,
     Downstream
@@ -114,6 +116,8 @@ private slots:
     void tokenGrantFinished();
     void profileRequestFinished();
 
+    void timeoutICEAddressLookup();
+
 signals:
     void iceServerChanged();
     void userConnected();
@@ -223,7 +227,7 @@ private:
 
     QList<QHostAddress> _iceServerAddresses;
     QSet<QHostAddress> _failedIceServerAddresses;
-    int _iceAddressLookupID { -1 };
+    int _iceAddressLookupID { INVALID_ICE_LOOKUP_ID };
     int _noReplyICEHeartbeats { 0 };
     int _numHeartbeatDenials { 0 };
     bool _connectedToICEServer { false };

From 3003f64514de62bdf43c5a8afd338404ca718abf Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 24 Aug 2017 16:42:53 -0700
Subject: [PATCH 37/78] add debug for ice server lookup fail

---
 domain-server/src/DomainServer.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index d9de9fe963..fc69a63b0d 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -725,6 +725,9 @@ void DomainServer::timeoutICEAddressLookup() {
     if (_iceAddressLookupID != INVALID_ICE_LOOKUP_ID) {
         // we waited 5s and didn't hear back for our ICE DNS lookup
         // so time that one out and kick off another
+
+        qDebug() << "IP address lookup timed out for" << _iceServerAddr << "- retrying";
+
         QHostInfo::abortHostLookup(_iceAddressLookupID);
 
         _iceAddressLookupID = INVALID_ICE_LOOKUP_ID;

From 36879f83eb6df2a0337a6d45f0f0e5ef8d3334a7 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Fri, 25 Aug 2017 15:44:07 +0200
Subject: [PATCH 38/78] Added scroll bar. Cleanup

---
 .../qml/controls/FlickableWebViewCore.qml     |  19 +++
 .../qml/controls/TabletWebScreen.qml          | 110 ----------------
 .../resources/qml/controls/TabletWebView.qml  | 118 ------------------
 interface/resources/qml/controls/WebView.qml  | 109 ----------------
 4 files changed, 19 insertions(+), 337 deletions(-)

diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index 7706eb1102..91e3f2482c 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -2,6 +2,10 @@ import QtQuick 2.7
 import QtWebEngine 1.5
 import QtWebChannel 1.0
 
+import QtQuick.Controls 2.2
+
+import "../styles-uit" as StylesUIt
+
 Flickable {
     id: flick
 
@@ -16,6 +20,21 @@ Flickable {
     signal newViewRequestedCallback(var request)
     signal loadingChangedCallback(var loadRequest)
 
+    StylesUIt.HifiConstants {
+        id: hifi
+    }
+
+    ScrollBar.vertical: ScrollBar {
+        id: scrollBar
+
+        contentItem: Rectangle {
+            opacity: 0.75
+            implicitWidth: hifi.dimensions.scrollbarHandleWidth
+            radius: height / 2
+            color: hifi.colors.tableScrollHandleDark
+        }
+    }
+
     function onLoadingChanged(loadRequest) {
         // Required to support clicking on "hifi://" links
         if (WebEngineView.LoadStartedStatus === loadRequest.status) {
diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index 665ce7ea27..e06ff51569 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -44,116 +44,6 @@ Item {
 
     }
 
-//    Flickable {
-//        id: flick
-//        width: parent.width
-//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
-
-//        WebEngineView {
-//            id: webroot
-//            objectName: "webEngineView"
-//            anchors.fill: parent
-
-//            profile: HFWebEngineProfile;
-
-//            property string userScriptUrl: ""
-
-//            // creates a global EventBridge object.
-//            WebEngineScript {
-//                id: createGlobalEventBridge
-//                sourceCode: eventBridgeJavaScriptToInject
-//                injectionPoint: WebEngineScript.DocumentCreation
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // detects when to raise and lower virtual keyboard
-//            WebEngineScript {
-//                id: raiseAndLowerKeyboard
-//                injectionPoint: WebEngineScript.Deferred
-//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // User script.
-//            WebEngineScript {
-//                id: userScript
-//                sourceUrl: webroot.userScriptUrl
-//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            property string urlTag: "noDownload=false";
-
-//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-//            property string newUrl: ""
-
-//            //disable popup
-//            onContextMenuRequested: {
-//                request.accepted = true;
-//            }
-
-//            onContentsSizeChanged: {
-//                flick.contentHeight = Math.max(contentsSize.height, flick.height);
-//                flick.contentWidth = flick.width
-//            }
-
-//            Component.onCompleted: {
-//                webChannel.registerObject("eventBridge", eventBridge);
-//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-//                // Ensure the JS from the web-engine makes it to our logging
-//                webroot.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-//                });
-
-//                webroot.profile.httpUserAgent = "Mozilla/5.0 Chrome (HighFidelityInterface)";
-//            }
-
-//            onFeaturePermissionRequested: {
-//                grantFeaturePermission(securityOrigin, feature, true);
-//            }
-
-//            onLoadingChanged: {
-//                keyboardRaised = false;
-//                punctuationMode = false;
-//                keyboard.resetShiftMode(false);
-
-//                // Required to support clicking on "hifi://" links
-//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-//                    flick.contentWidth = 0
-//                    flick.contentHeight = 0
-//                    var url = loadRequest.url.toString();
-//                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-//                    if (urlHandler.canHandleUrl(url)) {
-//                        if (urlHandler.handleUrl(url)) {
-//                            webroot.stop();
-//                        }
-//                    }
-//                }
-//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-//                    webroot.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-//                    })
-//                    flick.contentWidth = flick.width
-//                }
-//            }
-
-//            onNewViewRequested:{
-//                // desktop is not defined for web-entities or tablet
-//                if (typeof desktop !== "undefined") {
-//                    desktop.openBrowserWindow(request, profile);
-//                } else {
-//                    tabletRoot.openBrowserWindow(request, profile);
-//                }
-//            }
-//        }
-//    }
-
-//    HiFiControls.WebSpinner {
-//        anchors.centerIn: parent
-//        webroot: webroot
-//    }
-
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 626773907c..9bb5000d7e 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -165,124 +165,6 @@ Item {
         }
     }
 
-//    Flickable {
-//        id: flick
-//        width: parent.width
-//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height - web.headerHeight : parent.height - web.headerHeight
-//        anchors.top: buttons.bottom
-
-//        WebEngineView {
-//            id: webview
-//            objectName: "webEngineView"
-//            anchors.fill: parent
-
-//            profile: HFWebEngineProfile;
-
-//            property string userScriptUrl: ""
-
-//            // creates a global EventBridge object.
-//            WebEngineScript {
-//                id: createGlobalEventBridge
-//                sourceCode: eventBridgeJavaScriptToInject
-//                injectionPoint: WebEngineScript.DocumentCreation
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // detects when to raise and lower virtual keyboard
-//            WebEngineScript {
-//                id: raiseAndLowerKeyboard
-//                injectionPoint: WebEngineScript.Deferred
-//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // User script.
-//            WebEngineScript {
-//                id: userScript
-//                sourceUrl: webview.userScriptUrl
-//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            property string urlTag: "noDownload=false";
-//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-//            property string newUrl: ""
-
-//            Component.onCompleted: {
-//                webChannel.registerObject("eventBridge", eventBridge);
-//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-//                // Ensure the JS from the web-engine makes it to our logging
-//                webview.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-//                });
-//            }
-
-//            onFeaturePermissionRequested: {
-//                grantFeaturePermission(securityOrigin, feature, true);
-//            }
-
-//            onUrlChanged: {
-//                // Record history, skipping null and duplicate items.
-//                var urlString = url + "";
-//                urlString = urlString.replace(/\//g, "%2F");  // Consistent representation of "/"s to avoid false differences.
-//                if (urlString.length > 0 && (historyIndex === -1 || urlString !== history[historyIndex])) {
-//                    historyIndex++;
-//                    history = history.slice(0, historyIndex);
-//                    history.push(urlString);
-//                }
-//            }
-
-//            onContentsSizeChanged: {
-//                flick.contentHeight = Math.max(contentsSize.height, flick.height);
-//                flick.contentWidth = flick.width
-//            }
-//            //disable popup
-//            onContextMenuRequested: {
-//                request.accepted = true;
-//            }
-
-//            onLoadingChanged: {
-//                keyboardRaised = false;
-//                punctuationMode = false;
-//                keyboard.resetShiftMode(false);
-//                // Required to support clicking on "hifi://" links
-//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-//                    flick.contentWidth = 0
-//                    flick.contentHeight = 0
-//                    var url = loadRequest.url.toString();
-//                    if (urlHandler.canHandleUrl(url)) {
-//                        if (urlHandler.handleUrl(url)) {
-//                            root.stop();
-//                        }
-//                    }
-//                }
-
-//                if (WebEngineView.LoadFailedStatus == loadRequest.status) {
-//                    console.log(" Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
-//                }
-
-//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-//                    webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-//                    })
-//                    flick.contentWidth = flick.width
-
-//                    webview.forceActiveFocus();
-//                }
-//            }
-
-//            onNewViewRequested: {
-//                request.openIn(webview);
-//            }
-//        }
-//    }
-
-//    HiFiControls.WebSpinner {
-//        webview: webview
-//        anchors.centerIn: parent
-//    }
-
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index b4ec41ec9c..bf4b40e7c5 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -45,115 +45,6 @@ Item {
         }
     }
 
-//    Flickable {
-//        id: flick
-//        width: parent.width
-//        height: keyboardEnabled && keyboardRaised ? parent.height - keyboard.height : parent.height
-
-//        WebEngineView {
-//            id: root
-//            objectName: "webEngineView"
-//            anchors.fill: parent
-
-//            profile: HFWebEngineProfile;
-
-//            property string userScriptUrl: ""
-
-//            // creates a global EventBridge object.
-//            WebEngineScript {
-//                id: createGlobalEventBridge
-//                sourceCode: eventBridgeJavaScriptToInject
-//                injectionPoint: WebEngineScript.DocumentCreation
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // detects when to raise and lower virtual keyboard
-//            WebEngineScript {
-//                id: raiseAndLowerKeyboard
-//                injectionPoint: WebEngineScript.Deferred
-//                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            // User script.
-//            WebEngineScript {
-//                id: userScript
-//                sourceUrl: root.userScriptUrl
-//                injectionPoint: WebEngineScript.DocumentReady  // DOM ready but page load may not be finished.
-//                worldId: WebEngineScript.MainWorld
-//            }
-
-//            property string urlTag: "noDownload=false";
-
-//            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
-//            property string newUrl: ""
-
-//            Component.onCompleted: {
-//                webChannel.registerObject("eventBridge", eventBridge);
-//                webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
-//                // Ensure the JS from the web-engine makes it to our logging
-//                root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
-//                    console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " +  message);
-//                });
-
-//            }
-
-//            onFeaturePermissionRequested: {
-//                grantFeaturePermission(securityOrigin, feature, true);
-//            }
-
-//            onContentsSizeChanged: {
-//                console.log("WebView contentsSize", contentsSize)
-//                flick.contentWidth = flick.width
-//                flick.contentHeight = Math.max(contentsSize.height, flick.height)
-//            }
-//            //disable popup
-//            onContextMenuRequested: {
-//                request.accepted = true;
-//            }
-
-//            onLoadingChanged: {
-//                keyboardRaised = false;
-//                punctuationMode = false;
-//                keyboard.resetShiftMode(false);
-
-//                // Required to support clicking on "hifi://" links
-//                if (WebEngineView.LoadStartedStatus == loadRequest.status) {
-//                    flick.contentWidth = 0
-//                    flick.contentHeight = 0
-//                    var url = loadRequest.url.toString();
-//                    url = (url.indexOf("?") >= 0) ? url + urlTag : url + "?" + urlTag;
-//                    if (urlHandler.canHandleUrl(url)) {
-//                        if (urlHandler.handleUrl(url)) {
-//                            root.stop();
-//                        }
-//                    }
-//                }
-//                if (WebEngineView.LoadSucceededStatus == loadRequest.status) {
-//                    root.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-//                        flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
-//                    })
-//                    flick.contentWidth = flick.width
-//                }
-//            }
-
-//            onNewViewRequested:{
-//                // desktop is not defined for web-entities or tablet
-//                if (typeof desktop !== "undefined") {
-//                    desktop.openBrowserWindow(request, profile);
-//                } else {
-//                    tabletRoot.openBrowserWindow(request, profile);
-//                }
-//            }
-//        }
-//    }
-
-//    HiFiControls.WebSpinner {
-//        anchors.centerIn: parent
-//        webroot: root
-//    }
-
     HiFiControls.Keyboard {
         id: keyboard
         raised: parent.keyboardEnabled && parent.keyboardRaised

From b30562b9ce1f63bcf89dc56fa11a8fd3028cdb84 Mon Sep 17 00:00:00 2001
From: Armads <kurt_john@hotmail.com>
Date: Thu, 24 Aug 2017 14:25:07 -0400
Subject: [PATCH 39/78] Adding checks to hide avatar attachments to other head
 and facial joints

---
 interface/src/avatar/MyAvatar.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 76535930bc..983d0b252a 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1893,6 +1893,17 @@ void MyAvatar::preDisplaySide(RenderArgs* renderArgs) {
     const bool shouldDrawHead = shouldRenderHead(renderArgs);
     if (shouldDrawHead != _prevShouldDrawHead) {
         _skeletonModel->setEnableCauterization(!shouldDrawHead);
+
+        for (int i = 0; i < _attachmentData.size(); i++) {
+            if (_attachmentData[i].jointName.compare("Head", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("Neck", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("LeftEye", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("RightEye", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("HeadTop_End", Qt::CaseInsensitive) == 0 ||
+                _attachmentData[i].jointName.compare("Face", Qt::CaseInsensitive) == 0) {
+                _attachmentModels[i]->setVisibleInScene(shouldDrawHead, qApp->getMain3DScene());
+            }
+        }
     }
     _prevShouldDrawHead = shouldDrawHead;
 }

From 26026cb2b578e5394a6d80522749e64746168935 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Fri, 25 Aug 2017 17:37:10 +0200
Subject: [PATCH 40/78] Added logout. Truncate username to 8 characters

---
 .../resources/qml/hifi/tablet/Tablet.qml      | 37 ++++++++++++++-----
 .../resources/qml/hifi/tablet/TabletRoot.qml  |  6 +++
 .../scripting/AccountScriptingInterface.cpp   |  5 +++
 .../src/scripting/AccountScriptingInterface.h |  1 +
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index a99df632e5..3005fee4dd 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
+import QtQuick.Layouts 1.3
 
 import "../../styles-uit"
 import "../audio" as HifiAudio
@@ -116,20 +117,36 @@ Item {
             anchors.rightMargin: 30
             anchors.verticalCenter: parent.verticalCenter
 
-            RalewaySemiBold {
-                id: usernameText
-                text: Account.isLoggedIn() ? tabletRoot.username : qsTr("Log in")
-                anchors.verticalCenter: parent.verticalCenter
-                horizontalAlignment: Text.AlignRight
-                anchors.right: parent.right
-                font.pixelSize: 20
-                color: "#afafaf"
+            ColumnLayout {
+                anchors.fill: parent
+
+                RalewaySemiBold {
+                    text: Account.isLoggedIn() ? qsTr("Log out") : qsTr("Log in")
+                    horizontalAlignment: Text.AlignRight
+                    anchors.right: parent.right
+                    font.pixelSize: 20
+                    color: "#afafaf"
+                }
+
+                RalewaySemiBold {
+                    visible: Account.isLoggedIn()
+                    height: Account.isLoggedIn() ? parent.height/2 - parent.spacing/2 : 0
+                    text: Account.isLoggedIn() ? "[" + tabletRoot.usernameShort + "]" : ""
+                    horizontalAlignment: Text.AlignRight
+                    anchors.right: parent.right
+                    font.pixelSize: 20
+                    color: "#afafaf"
+                }
             }
+
             MouseArea {
                 anchors.fill: parent
-                enabled: !Account.isLoggedIn()
                 onClicked: {
-                    DialogsManager.showLoginDialog()
+                    if (!Account.isLoggedIn()) {
+                        DialogsManager.showLoginDialog()
+                    } else {
+                        Account.logOut()
+                    }
                 }
             }
         }
diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml
index bbf56c7827..683b181422 100644
--- a/interface/resources/qml/hifi/tablet/TabletRoot.qml
+++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml
@@ -8,6 +8,7 @@ Item {
     id: tabletRoot
     objectName: "tabletRoot"
     property string username: "Unknown user"
+    property string usernameShort: "Unknown user"
     property var rootMenu;
     property var openModal: null;
     property var openMessage: null;
@@ -157,6 +158,11 @@ Item {
 
     function setUsername(newUsername) {
         username = newUsername;
+        usernameShort = newUsername.substring(0, 8);
+
+        if (newUsername.length > 8) {
+            usernameShort = usernameShort + "..."
+        }
     }
 
     ListModel {
diff --git a/interface/src/scripting/AccountScriptingInterface.cpp b/interface/src/scripting/AccountScriptingInterface.cpp
index d8533bb769..4587d74893 100644
--- a/interface/src/scripting/AccountScriptingInterface.cpp
+++ b/interface/src/scripting/AccountScriptingInterface.cpp
@@ -31,6 +31,11 @@ bool AccountScriptingInterface::checkAndSignalForAccessToken() {
     return accountManager->checkAndSignalForAccessToken();
 }
 
+void AccountScriptingInterface::logOut() {
+    auto accountManager = DependencyManager::get<AccountManager>();
+    return accountManager->logout();
+}
+
 QString AccountScriptingInterface::getUsername() {
     auto accountManager = DependencyManager::get<AccountManager>();
     if (accountManager->isLoggedIn()) {
diff --git a/interface/src/scripting/AccountScriptingInterface.h b/interface/src/scripting/AccountScriptingInterface.h
index 748f110356..098d2c8ad9 100644
--- a/interface/src/scripting/AccountScriptingInterface.h
+++ b/interface/src/scripting/AccountScriptingInterface.h
@@ -50,6 +50,7 @@ public slots:
      */
     bool isLoggedIn();
     bool checkAndSignalForAccessToken();
+    void logOut();
 };
 
 #endif // hifi_AccountScriptingInterface_h

From e848253618d394548bb47920647d32b012b70c5e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 25 Aug 2017 10:57:30 -0700
Subject: [PATCH 41/78] remember if express or custom was selected for install

---
 cmake/macros/SetPackagingParameters.cmake |   3 +-
 cmake/templates/NSIS.template.in          | 135 +++++++++++-----------
 2 files changed, 71 insertions(+), 67 deletions(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index fea244873c..8458d53f68 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -133,7 +133,7 @@ macro(SET_PACKAGING_PARAMETERS)
       else()
         message( FATAL_ERROR "Visual Studio 2013 or higher required." )
       endif()
-  
+
       if (NOT SIGNTOOL_EXECUTABLE)
         message(FATAL_ERROR "Code signing of executables was requested but signtool.exe could not be found.")
       endif ()
@@ -147,6 +147,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(CONSOLE_STARTUP_REG_KEY "ConsoleStartupShortcut")
     set(CLIENT_LAUNCH_NOW_REG_KEY "ClientLaunchAfterInstall")
     set(SERVER_LAUNCH_NOW_REG_KEY "ServerLaunchAfterInstall")
+    set(CUSTOM_INSTALL_REG_KEY "CustomInstall")
   endif ()
 
   # setup component categories for installer
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index de79b49a74..7cd613fc23 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -49,7 +49,7 @@
     Var STR_CONTAINS_VAR_3
     Var STR_CONTAINS_VAR_4
     Var STR_RETURN_VAR
-        
+
     Function StrContains
       Exch $STR_NEEDLE
       Exch 1
@@ -343,29 +343,29 @@ SectionEnd
 ;--------------------------------
 ;Pages
   !insertmacro MUI_PAGE_WELCOME
-  
+
   !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
-  
+
   Page custom InstallTypesPage ReadInstallTypes
-  
+
   !define MUI_PAGE_CUSTOMFUNCTION_PRE AbortFunction
   !insertmacro MUI_PAGE_DIRECTORY
-  
+
   ;Start Menu Folder Page Configuration
   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
   !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  
+
   !define MUI_PAGE_CUSTOMFUNCTION_PRE AbortFunction
   !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-  
+
   !define MUI_PAGE_CUSTOMFUNCTION_PRE AbortFunction
   @CPACK_NSIS_PAGE_COMPONENTS@
-    
+
   Page custom PostInstallOptionsPage ReadPostInstallOptions
 
   !insertmacro MUI_PAGE_INSTFILES
-  
+
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
 
@@ -454,8 +454,8 @@ Var CustomInstallRadioButton
 Var InstallTypeDialog
 Var Express
 
-!macro SetPostInstallOption Checkbox OptionName Default
-  ; reads the value for the given post install option to the registry
+!macro SetInstallOption Checkbox OptionName Default
+  ; reads the value for the given install option to the registry
   ReadRegStr $0 HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "${OptionName}"
 
   ${If} $0 == "NO"
@@ -472,31 +472,31 @@ Var Express
 
 Function InstallTypesPage
   !insertmacro MUI_HEADER_TEXT "Choose Installation Type" "Express or Custom Install"
-  
+
   nsDialogs::Create 1018
   Pop $InstallTypeDialog
-  
+
   ${If} $InstallTypeDialog == error
     Abort
   ${EndIf}
-  
+
   StrCpy $CurrentOffset 0
   StrCpy $OffsetUnits u
-  StrCpy $Express "0"  
-  
+  StrCpy $Express "0"
+
   ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls High Fidelity Interface and High Fidelity Sandbox"
   pop $ExpressInstallRadioButton
   ${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel
   IntOp $CurrentOffset $CurrentOffset + 15
-  
+
   ${NSD_CreateRadiobutton} 30% $CurrentOffset$OffsetUnits 100% 10u "Custom Install (Advanced)"
   pop $CustomInstallRadioButton
-  ${NSD_OnClick} $CustomInstallRadioButton ChangeCustomLabel 
-  
-  ; Express Install selected by default
-  ${NSD_Check} $ExpressInstallRadioButton
+  ${NSD_OnClick} $CustomInstallRadioButton ChangeCustomLabel
+
+  ; read the install type from the registry, select express install by default
+  !insertmacro SetInstallOption $ExpressInstallRadioButton @CUSTOM_INSTALL_REG_KEY@ ${BST_CHECKED}
   Call ChangeExpressLabel
-  
+
   nsDialogs::Show
 FunctionEnd
 
@@ -519,18 +519,18 @@ Function AbortFunction
   StrCmp $Express "1" 0 end
   Abort
   end:
-FunctionEnd  
+FunctionEnd
 
 Function PostInstallOptionsPage
   !insertmacro MUI_HEADER_TEXT "Setup Options" ""
 
   nsDialogs::Create 1018
   Pop $PostInstallDialog
-  
+
   ${If} $PostInstallDialog == error
     Abort
   ${EndIf}
-  
+
   ; Check if Express is set, if so, abort the post install options page
   StrCmp $Express "1" 0 end
   Abort
@@ -543,18 +543,18 @@ Function PostInstallOptionsPage
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_HF_SHORTCUT_NAME@"
     Pop $DesktopClientCheckbox
     IntOp $CurrentOffset $CurrentOffset + 15
-    
+
     ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $DesktopClientCheckbox @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ ${BST_CHECKED}
+    !insertmacro SetInstallOption $DesktopClientCheckbox @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ ${BST_CHECKED}
   ${EndIf}
-  
+
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @CONSOLE_HF_SHORTCUT_NAME@"
     Pop $DesktopServerCheckbox
     IntOp $CurrentOffset $CurrentOffset + 15
-    
+
     ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $DesktopServerCheckbox @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ ${BST_UNCHECKED}
+    !insertmacro SetInstallOption $DesktopServerCheckbox @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ ${BST_UNCHECKED}
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
@@ -562,7 +562,7 @@ Function PostInstallOptionsPage
     Pop $LaunchServerNowCheckbox
 
     ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $LaunchServerNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
+    !insertmacro SetInstallOption $LaunchServerNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
     ${StrContains} $substringResult "/forceNoLaunchServer" $CMDLINE
     ${IfNot} $substringResult == ""
         ${NSD_SetState} $LaunchServerNowCheckbox ${BST_UNCHECKED}
@@ -570,29 +570,29 @@ Function PostInstallOptionsPage
 
     IntOp $CurrentOffset $CurrentOffset + 15
   ${EndIf}
-  
+
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @INTERFACE_HF_SHORTCUT_NAME@ after install"
     Pop $LaunchClientNowCheckbox
     IntOp $CurrentOffset $CurrentOffset + 30
-    
+
     ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $LaunchClientNowCheckbox @CLIENT_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
+    !insertmacro SetInstallOption $LaunchClientNowCheckbox @CLIENT_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
     ${StrContains} $substringResult "/forceNoLaunchClient" $CMDLINE
     ${IfNot} $substringResult == ""
     ${NSD_SetState} $LaunchClientNowCheckbox ${BST_UNCHECKED}
     ${EndIf}
   ${EndIf}
-  
+
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ on startup"
     Pop $ServerStartupCheckbox
     IntOp $CurrentOffset $CurrentOffset + 15
-    
+
     ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $ServerStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_CHECKED}
+    !insertmacro SetInstallOption $ServerStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_CHECKED}
   ${EndIf}
-  
+
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Perform a clean install (Delete older settings and content)"
     Pop $CleanInstallCheckbox
@@ -618,12 +618,12 @@ Function PostInstallOptionsPage
 
     ${NSD_SetState} $CopyFromProductionCheckbox ${BST_UNCHECKED}
   ${EndIf}
-  
+
   nsDialogs::Show
 FunctionEnd
 
-!macro WritePostInstallOption OptionName Option
-  ; writes the value for the given post install option to the registry
+!macro WriteInstallOption OptionName Option
+  ; writes the value for the given install option to the registry
   WriteRegStr HKLM "@REGISTRY_HKLM_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\@POST_INSTALL_OPTIONS_REG_GROUP@" "${OptionName}" ${Option}
 !macroend
 
@@ -641,12 +641,12 @@ Function ReadInstallTypes
   ; check if the user asked for express/custom install
   ${NSD_GetState} $ExpressInstallRadioButton $ExpressInstallState
   ${NSD_GetState} $CustomInstallRadioButton $CustomInstallState
-  
+
   ${If} $ExpressInstallState == ${BST_CHECKED}
     StrCpy $Express "1"
-    
-    StrCpy $DesktopClientState ${BST_CHECKED}  
-    StrCpy $ServerStartupState ${BST_CHECKED} 
+
+    StrCpy $DesktopClientState ${BST_CHECKED}
+    StrCpy $ServerStartupState ${BST_CHECKED}
     StrCpy $LaunchServerNowState ${BST_CHECKED}
     StrCpy $LaunchClientNowState ${BST_CHECKED}
     StrCpy $CleanInstallState ${BST_UNCHECKED}
@@ -655,9 +655,12 @@ Function ReadInstallTypes
     ${If} @PR_BUILD@ == 1
       StrCpy $CopyFromProductionState ${BST_UNCHECKED}
     ${EndIf}
-    
+
+    !insertmacro WriteInstallOption "@CUSTOM_INSTALL_REG_KEY@" NO
+  ${Else}
+    !insertmacro WriteInstallOption "@CUSTOM_INSTALL_REG_KEY@" YES
   ${EndIf}
-  
+
 FunctionEnd
 
 Function ReadPostInstallOptions
@@ -683,12 +686,12 @@ Function ReadPostInstallOptions
     ; check if we need to launch the server post-install
     ${NSD_GetState} $LaunchServerNowCheckbox $LaunchServerNowState
   ${EndIf}
-  
+
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ; check if we need to launch the client post-install
     ${NSD_GetState} $LaunchClientNowCheckbox $LaunchClientNowState
   ${EndIf}
-   
+
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ; check if the user asked for a clean install
     ${NSD_GetState} $CleanInstallCheckbox $CleanInstallState
@@ -700,9 +703,9 @@ Function HandlePostInstallOptions
     ; check if the user asked for a desktop shortcut to High Fidelity
     ${If} $DesktopClientState == ${BST_CHECKED}
       CreateShortCut "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
-      !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES
+      !insertmacro WriteInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES
     ${Else}
-      !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO
     ${EndIf}
 
   ${EndIf}
@@ -711,12 +714,12 @@ Function HandlePostInstallOptions
     ; check if the user asked for a desktop shortcut to Sandbox
     ${If} $DesktopServerState == ${BST_CHECKED}
       CreateShortCut "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
-      !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
+      !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
     ${Else}
-      !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
     ${EndIf}
 
-    
+
     ; check if the user asked to have Sandbox launched every startup
     ${If} $ServerStartupState == ${BST_CHECKED}
       ; in case we added a shortcut in the global context, pull that now
@@ -730,12 +733,12 @@ Function HandlePostInstallOptions
       ; reset the shell var context back
       SetShellVarContext all
 
-      !insertmacro WritePostInstallOption @CONSOLE_STARTUP_REG_KEY@ YES
+      !insertmacro WriteInstallOption @CONSOLE_STARTUP_REG_KEY@ YES
     ${Else}
-      !insertmacro WritePostInstallOption @CONSOLE_STARTUP_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CONSOLE_STARTUP_REG_KEY@ NO
     ${EndIf}
   ${EndIf}
-  
+
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ; check if the user asked for a clean install
     ${If} $CleanInstallState == ${BST_CHECKED}
@@ -774,28 +777,28 @@ Function HandlePostInstallOptions
   ${EndIf}
 
   ${If} $LaunchServerNowState == ${BST_CHECKED}
-    !insertmacro WritePostInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES
+    !insertmacro WriteInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES
 
     ; both launches use the explorer trick in case the user has elevated permissions for the installer
     ${If} $LaunchClientNowState == ${BST_CHECKED}
-      !insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
+      !insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
       ; create shortcut with ARGUMENTS
       CreateShortCut "$TEMP\SandboxShortcut.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" "-- --launchInterface"
       Exec '"$WINDIR\explorer.exe" "$TEMP\SandboxShortcut.lnk"'
     ${Else}
-      !insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
       Exec '"$WINDIR\explorer.exe" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"'
     ${EndIf}
 
   ${Else}
-    !insertmacro WritePostInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ NO
+    !insertmacro WriteInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ NO
 
     ; launch uses the explorer trick in case the user has elevated permissions for the installer
     ${If} $LaunchClientNowState == ${BST_CHECKED}
-      !insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
+      !insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
       Exec '"$WINDIR\explorer.exe" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"'
     ${Else}
-      !insertmacro WritePostInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
+      !insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
     ${EndIf}
 
   ${EndIf}
@@ -843,7 +846,7 @@ Section "-Core installation"
   Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml"
 
   ExecWait "$INSTDIR\vcredist_x64.exe /install /q /norestart"
-  
+
   ; Remove the Old Interface directory and vcredist_x64.exe (from installs prior to Server Console)
   RMDir /r "$INSTDIR\Interface"
   Delete "$INSTDIR\vcredist_x64.exe"
@@ -943,9 +946,9 @@ Section "-Core installation"
   Call ConditionalAddToRegisty
 
   !insertmacro MUI_STARTMENU_WRITE_END
-  
+
   @CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
-  
+
   ; Handle whichever post install options were set
   Call HandlePostInstallOptions
 

From 6ac255dd2153c0e9fef706f29893ca95c87d1a2a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 25 Aug 2017 12:07:26 -0700
Subject: [PATCH 42/78] add custom install reg key to cpack properties

---
 cmake/templates/CPackProperties.cmake.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/templates/CPackProperties.cmake.in b/cmake/templates/CPackProperties.cmake.in
index c1e3d9d773..b91d78f628 100644
--- a/cmake/templates/CPackProperties.cmake.in
+++ b/cmake/templates/CPackProperties.cmake.in
@@ -40,6 +40,7 @@ set(CONSOLE_DESKTOP_SHORTCUT_REG_KEY "@CONSOLE_DESKTOP_SHORTCUT_REG_KEY@")
 set(CONSOLE_STARTUP_REG_KEY "@CONSOLE_STARTUP_REG_KEY@")
 set(SERVER_LAUNCH_NOW_REG_KEY "@SERVER_LAUNCH_NOW_REG_KEY@")
 set(CLIENT_LAUNCH_NOW_REG_KEY "@CLIENT_LAUNCH_NOW_REG_KEY@")
+set(CUSTOM_INSTALL_REG_KEY "@CUSTOM_INSTALL_REG_KEY@")
 set(INSTALLER_HEADER_IMAGE "@INSTALLER_HEADER_IMAGE@")
 set(UNINSTALLER_HEADER_IMAGE "@UNINSTALLER_HEADER_IMAGE@")
 set(ADD_REMOVE_ICON_PATH "@ADD_REMOVE_ICON_PATH@")

From 2661f92e0949bc202144f08bf2802a7c147521d3 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 25 Aug 2017 14:05:40 -0700
Subject: [PATCH 43/78] fix state setting for express/custom

---
 cmake/templates/NSIS.template.in | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 7cd613fc23..64b7299b9b 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -453,6 +453,7 @@ Var ExpressInstallRadioButton
 Var CustomInstallRadioButton
 Var InstallTypeDialog
 Var Express
+Var CustomInstallTemporaryState
 
 !macro SetInstallOption Checkbox OptionName Default
   ; reads the value for the given install option to the registry
@@ -493,8 +494,16 @@ Function InstallTypesPage
   pop $CustomInstallRadioButton
   ${NSD_OnClick} $CustomInstallRadioButton ChangeCustomLabel
 
-  ; read the install type from the registry, select express install by default
-  !insertmacro SetInstallOption $ExpressInstallRadioButton @CUSTOM_INSTALL_REG_KEY@ ${BST_CHECKED}
+  ; check install type from the registry, express install by default
+  !insertmacro SetInstallOption $CustomInstallRadioButton @CUSTOM_INSTALL_REG_KEY@ ${BST_UNCHECKED}
+
+  ; set the express install value based on the custom install value from registry
+  ${NSD_GetState} $CustomInstallRadioButton $CustomInstallTemporaryState
+
+  ${If} $CustomInstallTemporaryState == ${BST_UNCHECKED}
+    ${NSD_Check} $ExpressInstallRadioButton
+  ${EndIf}
+
   Call ChangeExpressLabel
 
   nsDialogs::Show

From 59fe5ffdc12acb2d2f7fee14c16344ca5f0f9ce1 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Fri, 25 Aug 2017 17:48:35 -0700
Subject: [PATCH 44/78] Initial attempt at changing first run behavior

---
 interface/src/Application.cpp | 50 +++--------------------------------
 1 file changed, 3 insertions(+), 47 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index affbf83081..20d7509ea5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2755,26 +2755,18 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         handControllerType = Oculus;
     }
 
-    // Check tutorial content versioning
-    bool hasTutorialContent = contentVersion >= MIN_CONTENT_VERSION.at(handControllerType);
-
     // Check HMD use (may be technically available without being in use)
     bool hasHMD = PluginUtils::isHMDAvailable();
     bool isUsingHMD = _displayPlugin->isHmd();
     bool isUsingHMDAndHandControllers = hasHMD && hasHandControllers && isUsingHMD;
 
-    Setting::Handle<bool> tutorialComplete{ "tutorialComplete", false };
     Setting::Handle<bool> firstRun{ Settings::firstRun, true };
 
     const QString HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY = "--skipTutorial";
     // Skips tutorial/help behavior, and does NOT clear firstRun setting.
     bool skipTutorial = arguments().contains(HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY);
-    bool isTutorialComplete = tutorialComplete.get();
-    bool shouldGoToTutorial = isUsingHMDAndHandControllers && hasTutorialContent && !isTutorialComplete && !skipTutorial;
 
     qCDebug(interfaceapp) << "HMD:" << hasHMD << ", Hand Controllers: " << hasHandControllers << ", Using HMD: " << isUsingHMDAndHandControllers;
-    qCDebug(interfaceapp) << "Tutorial version:" << contentVersion << ", sufficient:" << hasTutorialContent <<
-        ", complete:" << isTutorialComplete << ", should go:" << shouldGoToTutorial;
 
     // when --url in command line, teleport to location
     const QString HIFI_URL_COMMAND_LINE_KEY = "--url";
@@ -2784,39 +2776,15 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         addressLookupString = arguments().value(urlIndex + 1);
     }
 
-    const QString TUTORIAL_PATH = "/tutorial_begin";
-
-    static const QString SENT_TO_TUTORIAL = "tutorial";
     static const QString SENT_TO_PREVIOUS_LOCATION = "previous_location";
     static const QString SENT_TO_ENTRY = "entry";
     static const QString SENT_TO_SANDBOX = "sandbox";
 
     QString sentTo;
 
-    if (shouldGoToTutorial) {
-        if (sandboxIsRunning) {
-            qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
-            DependencyManager::get<AddressManager>()->goToLocalSandbox(TUTORIAL_PATH);
-            sentTo = SENT_TO_TUTORIAL;
-        } else {
-            qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
-            if (firstRun.get()) {
-                showHelp();
-            }
-            if (addressLookupString.isEmpty()) {
-                DependencyManager::get<AddressManager>()->goToEntry();
-                sentTo = SENT_TO_ENTRY;
-            } else {
-                DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
-                sentTo = SENT_TO_PREVIOUS_LOCATION;
-            }
-        }
-    } else {
-
         // If this is a first run we short-circuit the address passed in
-        if (firstRun.get() && !skipTutorial) {
+        if (firstRun.get()) {
             showHelp();
-            if (isUsingHMDAndHandControllers) {
                 if (sandboxIsRunning) {
                     qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
                     DependencyManager::get<AddressManager>()->goToLocalSandbox();
@@ -2826,16 +2794,12 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
                     DependencyManager::get<AddressManager>()->goToEntry();
                     sentTo = SENT_TO_ENTRY;
                 }
-            } else {
-                DependencyManager::get<AddressManager>()->goToEntry();
-                sentTo = SENT_TO_ENTRY;
-            }
+
         } else {
             qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(addressLookupString.isEmpty() ? QString("previous location") : addressLookupString);
             DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
             sentTo = SENT_TO_PREVIOUS_LOCATION;
         }
-    }
 
     UserActivityLogger::getInstance().logAction("startup_sent_to", {
         { "sent_to", sentTo },
@@ -2844,18 +2808,10 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         { "has_hand_controllers", hasHandControllers },
         { "is_using_hmd", isUsingHMD },
         { "is_using_hmd_and_hand_controllers", isUsingHMDAndHandControllers },
-        { "content_version", contentVersion },
-        { "is_tutorial_complete", isTutorialComplete },
-        { "has_tutorial_content", hasTutorialContent },
-        { "should_go_to_tutorial", shouldGoToTutorial }
+        { "content_version", contentVersion }
     });
 
     _connectionMonitor.init();
-
-    // After all of the constructor is completed, then set firstRun to false.
-    if (!skipTutorial) {
-        firstRun.set(false);
-    }
 }
 
 bool Application::importJSONFromURL(const QString& urlString) {

From e38075f7bad8e708a06b4d778411ac6d5c639240 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Mon, 28 Aug 2017 16:27:33 +0200
Subject: [PATCH 45/78] Disable web engine scrollbars

---
 interface/resources/qml/controls/FlickableWebViewCore.qml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index 91e3f2482c..24d9cb9184 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -53,6 +53,9 @@ Flickable {
         }
 
         if (WebEngineView.LoadSucceededStatus === loadRequest.status) {
+            //disable Chromium's scroll bars
+            _webview.runJavaScript("document.body.style.overflow = 'hidden';");
+            //calculate page height
             _webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
                 flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
             })

From 59deccaeb5db0479b44c5f83e1687dc2b809bb7e Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Tue, 29 Aug 2017 14:55:59 -0700
Subject: [PATCH 46/78] Remove unused skipTutorial code

---
 interface/src/Application.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 20d7509ea5..db28516cb0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2762,10 +2762,6 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
 
     Setting::Handle<bool> firstRun{ Settings::firstRun, true };
 
-    const QString HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY = "--skipTutorial";
-    // Skips tutorial/help behavior, and does NOT clear firstRun setting.
-    bool skipTutorial = arguments().contains(HIFI_SKIP_TUTORIAL_COMMAND_LINE_KEY);
-
     qCDebug(interfaceapp) << "HMD:" << hasHMD << ", Hand Controllers: " << hasHandControllers << ", Using HMD: " << isUsingHMDAndHandControllers;
 
     // when --url in command line, teleport to location

From 2f2b406047cf34aef208bf2a0e07b6a4e840eaa6 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Wed, 30 Aug 2017 09:23:33 -0700
Subject: [PATCH 47/78] Remove unneeded handcontrollertype code from handle
 first run checks

---
 interface/src/Application.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index db28516cb0..233aa4fe81 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2746,13 +2746,8 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
 
     // Get controller availability
     bool hasHandControllers = false;
-    HandControllerType handControllerType = Vive;
-    if (PluginUtils::isViveControllerAvailable()) {
+    if (PluginUtils::isViveControllerAvailable() || PluginUtils::isOculusTouchControllerAvailable()) {
         hasHandControllers = true;
-        handControllerType = Vive;
-    } else if (PluginUtils::isOculusTouchControllerAvailable()) {
-        hasHandControllers = true;
-        handControllerType = Oculus;
     }
 
     // Check HMD use (may be technically available without being in use)

From 88b045e3a97b71e8703807498b246898fafc88cb Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Wed, 30 Aug 2017 20:17:11 +0200
Subject: [PATCH 48/78] Switched off overboundings. More accurate calculate
 height

---
 .../qml/controls/FlickableWebViewCore.qml     | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index 24d9cb9184..0460b5b16a 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -20,12 +20,23 @@ Flickable {
     signal newViewRequestedCallback(var request)
     signal loadingChangedCallback(var loadRequest)
 
+    boundsBehavior: Flickable.StopAtBounds
+
     StylesUIt.HifiConstants {
         id: hifi
     }
 
+    onHeightChanged: {
+        if (height > 0) {
+            //reload page since window dimentions changed,
+            //so web engine should recalculate page render dimentions
+            reloadTimer.start()
+        }
+    }
+
     ScrollBar.vertical: ScrollBar {
         id: scrollBar
+        visible: flick.contentHeight > flick.height
 
         contentItem: Rectangle {
             opacity: 0.75
@@ -36,10 +47,11 @@ Flickable {
     }
 
     function onLoadingChanged(loadRequest) {
-        // Required to support clicking on "hifi://" links
         if (WebEngineView.LoadStartedStatus === loadRequest.status) {
-            flick.contentWidth = 0
-            flick.contentHeight = 0
+            flick.contentWidth = flick.width
+            flick.contentHeight = flick.height
+
+            // Required to support clicking on "hifi://" links
             var url = loadRequest.url.toString();
             if (urlHandler.canHandleUrl(url)) {
                 if (urlHandler.handleUrl(url)) {
@@ -57,12 +69,25 @@ Flickable {
             _webview.runJavaScript("document.body.style.overflow = 'hidden';");
             //calculate page height
             _webview.runJavaScript("document.body.scrollHeight;", function (i_actualPageHeight) {
-                flick.contentHeight = Math.max(i_actualPageHeight, flick.height);
+                if (i_actualPageHeight !== undefined) {
+                    flick.contentHeight = i_actualPageHeight
+                } else {
+                    flick.contentHeight = flick.height;
+                }
             })
             flick.contentWidth = flick.width
         }
     }
 
+    Timer {
+        id: reloadTimer
+        interval: 100
+        repeat: false
+        onTriggered: {
+            _webview.reload()
+        }
+    }
+
     WebEngineView {
         id: _webview
 
@@ -100,7 +125,6 @@ Flickable {
 
         Component.onCompleted: {
             width = Qt.binding(function() { return flick.width; });
-
             webChannel.registerObject("eventBridge", eventBridge);
             webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
             // Ensure the JS from the web-engine makes it to our logging

From b547b2573e16b26b6d90bf6cab54be0b78f73238 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Wed, 30 Aug 2017 23:15:39 +0200
Subject: [PATCH 49/78] Added logged in property

---
 interface/resources/qml/hifi/tablet/Tablet.qml    | 10 +++++-----
 .../src/scripting/AccountScriptingInterface.cpp   | 12 ++++++++++++
 .../src/scripting/AccountScriptingInterface.h     | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index 3005fee4dd..66e3dfdbbb 100644
--- a/interface/resources/qml/hifi/tablet/Tablet.qml
+++ b/interface/resources/qml/hifi/tablet/Tablet.qml
@@ -121,7 +121,7 @@ Item {
                 anchors.fill: parent
 
                 RalewaySemiBold {
-                    text: Account.isLoggedIn() ? qsTr("Log out") : qsTr("Log in")
+                    text: Account.loggedIn ? qsTr("Log out") : qsTr("Log in")
                     horizontalAlignment: Text.AlignRight
                     anchors.right: parent.right
                     font.pixelSize: 20
@@ -129,9 +129,9 @@ Item {
                 }
 
                 RalewaySemiBold {
-                    visible: Account.isLoggedIn()
-                    height: Account.isLoggedIn() ? parent.height/2 - parent.spacing/2 : 0
-                    text: Account.isLoggedIn() ? "[" + tabletRoot.usernameShort + "]" : ""
+                    visible: Account.loggedIn
+                    height: Account.loggedIn ? parent.height/2 - parent.spacing/2 : 0
+                    text: Account.loggedIn ? "[" + tabletRoot.usernameShort + "]" : ""
                     horizontalAlignment: Text.AlignRight
                     anchors.right: parent.right
                     font.pixelSize: 20
@@ -142,7 +142,7 @@ Item {
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
-                    if (!Account.isLoggedIn()) {
+                    if (!Account.loggedIn) {
                         DialogsManager.showLoginDialog()
                     } else {
                         Account.logOut()
diff --git a/interface/src/scripting/AccountScriptingInterface.cpp b/interface/src/scripting/AccountScriptingInterface.cpp
index 4587d74893..068cccdc50 100644
--- a/interface/src/scripting/AccountScriptingInterface.cpp
+++ b/interface/src/scripting/AccountScriptingInterface.cpp
@@ -18,6 +18,8 @@ AccountScriptingInterface* AccountScriptingInterface::getInstance() {
     auto accountManager = DependencyManager::get<AccountManager>();
     QObject::connect(accountManager.data(), &AccountManager::profileChanged,
                      &sharedInstance, &AccountScriptingInterface::usernameChanged);
+    QObject::connect(accountManager.data(), &AccountManager::usernameChanged,
+                     &sharedInstance, &AccountScriptingInterface::onUsernameChanged);
     return &sharedInstance;
 }
 
@@ -36,6 +38,16 @@ void AccountScriptingInterface::logOut() {
     return accountManager->logout();
 }
 
+AccountScriptingInterface::AccountScriptingInterface(QObject *parent): QObject(parent) {
+    m_loggedIn = isLoggedIn();
+    emit loggedInChanged(m_loggedIn);
+}
+
+void AccountScriptingInterface::onUsernameChanged(QString username) {
+    m_loggedIn = (username != QString());
+    emit loggedInChanged(m_loggedIn);
+}
+
 QString AccountScriptingInterface::getUsername() {
     auto accountManager = DependencyManager::get<AccountManager>();
     if (accountManager->isLoggedIn()) {
diff --git a/interface/src/scripting/AccountScriptingInterface.h b/interface/src/scripting/AccountScriptingInterface.h
index 098d2c8ad9..4f87e02dce 100644
--- a/interface/src/scripting/AccountScriptingInterface.h
+++ b/interface/src/scripting/AccountScriptingInterface.h
@@ -18,6 +18,7 @@ class AccountScriptingInterface : public QObject {
     Q_OBJECT
 
     Q_PROPERTY(QString username READ getUsername NOTIFY usernameChanged)
+    Q_PROPERTY(bool loggedIn READ loggedIn NOTIFY loggedInChanged)
 
     /**jsdoc
      * @namespace Account
@@ -32,6 +33,7 @@ signals:
      * @return {Signal}
      */
     void usernameChanged();
+    void loggedInChanged(bool loggedIn);
 
 public slots:
     static AccountScriptingInterface* getInstance();
@@ -51,6 +53,19 @@ public slots:
     bool isLoggedIn();
     bool checkAndSignalForAccessToken();
     void logOut();
+
+public:
+    AccountScriptingInterface(QObject* parent = nullptr);
+    bool loggedIn() const {
+        return m_loggedIn;
+    }
+
+private slots:
+    void onUsernameChanged(QString username);
+
+private:
+    bool m_loggedIn { false };
+
 };
 
 #endif // hifi_AccountScriptingInterface_h

From a80d9a22df59ad1692713f3214f3c0f90811967f Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Thu, 31 Aug 2017 12:20:20 +0200
Subject: [PATCH 50/78] Added option to disable flickable for web view

---
 interface/resources/qml/controls/WebView.qml        | 1 +
 interface/resources/qml/hifi/tablet/EditTabView.qml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index bf4b40e7c5..c38c5df9cf 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -13,6 +13,7 @@ Item {
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
     property bool punctuationMode: false
+    property alias flickable: webroot.interactive
 
     // FIXME - Keyboard HMD only: Make Interface either set keyboardRaised property directly in OffscreenQmlSurface
     // or provide HMDinfo object to QML in RenderableWebEntityItem and do the following.
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index e94325f399..5379e88f8d 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -181,6 +181,7 @@ TabView {
         WebView {
             id: entityListToolWebView
             url: Paths.defaultScripts + "/system/html/entityList.html"
+            flickable: false
             anchors.fill: parent
             enabled: true
         }
@@ -209,6 +210,7 @@ TabView {
         WebView {
             id: gridControlsWebView
             url: Paths.defaultScripts + "/system/html/gridControls.html"
+            flickable: false
             anchors.fill: parent
             enabled: true
         }

From 6faab9fb1c8360dec61d76d24dd43efe466a5c07 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Thu, 31 Aug 2017 19:21:38 +0200
Subject: [PATCH 51/78] Switch flickable on by default for list and grid tabs

---
 interface/resources/qml/hifi/tablet/EditTabView.qml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index 5379e88f8d..e94325f399 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -181,7 +181,6 @@ TabView {
         WebView {
             id: entityListToolWebView
             url: Paths.defaultScripts + "/system/html/entityList.html"
-            flickable: false
             anchors.fill: parent
             enabled: true
         }
@@ -210,7 +209,6 @@ TabView {
         WebView {
             id: gridControlsWebView
             url: Paths.defaultScripts + "/system/html/gridControls.html"
-            flickable: false
             anchors.fill: parent
             enabled: true
         }

From fb79ba2c6c00f42055961e1af6d8df59e8864dd2 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Thu, 31 Aug 2017 10:49:49 -0700
Subject: [PATCH 52/78] Migrate to vcpkg version of OpenSSL

---
 cmake/modules/FindOpenSSL.cmake | 60 ++++-----------------------------
 1 file changed, 6 insertions(+), 54 deletions(-)

diff --git a/cmake/modules/FindOpenSSL.cmake b/cmake/modules/FindOpenSSL.cmake
index 69b6c367ca..338dee7bc8 100644
--- a/cmake/modules/FindOpenSSL.cmake
+++ b/cmake/modules/FindOpenSSL.cmake
@@ -34,26 +34,11 @@ if (UNIX)
 endif ()
 
 if (WIN32)
-
-  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
-
-  if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    # http://www.slproweb.com/products/Win32OpenSSL.html
-    set(_OPENSSL_ROOT_HINTS ${OPENSSL_ROOT_DIR} $ENV{OPENSSL_ROOT_DIR} $ENV{HIFI_LIB_DIR}/openssl
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
-    )
-    set(_OPENSSL_ROOT_PATHS "${_programfiles}/OpenSSL" "${_programfiles}/OpenSSL-Win64" "C:/OpenSSL/" "C:/OpenSSL-Win64/")
+  if (("${CMAKE_SIZEOF_VOID_P}" EQUAL "8"))
+    set(_OPENSSL_ROOT_HINTS_AND_PATHS $ENV{VCPKG_ROOT}/installed/x64-windows)
   else()
-    # http://www.slproweb.com/products/Win32OpenSSL.html
-    set(_OPENSSL_ROOT_HINTS ${OPENSSL_ROOT_DIR} $ENV{OPENSSL_ROOT_DIR} $ENV{HIFI_LIB_DIR}/openssl
-      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
-    )
-    set(_OPENSSL_ROOT_PATHS "${_programfiles}/OpenSSL" "${_programfiles}/OpenSSL-Win32" "C:/OpenSSL/" "C:/OpenSSL-Win32/")
+    set(_OPENSSL_ROOT_HINTS_AND_PATHS $ENV{VCPKG_ROOT}/installed/x86-windows)
   endif()
-
-  unset(_programfiles)
-  set(_OPENSSL_ROOT_HINTS_AND_PATHS HINTS ${_OPENSSL_ROOT_HINTS} PATHS ${_OPENSSL_ROOT_PATHS})
-
 else ()
   include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
   hifi_library_search_hints("openssl")
@@ -67,47 +52,14 @@ find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h HINTS ${_OPENSSL_ROOT_HINTS_AN
 
 if (WIN32 AND NOT CYGWIN)
   if (MSVC)
-
-    # In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
-    #   * MD for dynamic-release
-    #   * MDd for dynamic-debug
-    #   * MT for static-release
-    #   * MTd for static-debug
-
-    # Implementation details:
-    # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
-    # libeay32MD.lib is identical to ../libeay32.lib, and
-    # ssleay32MD.lib is identical to ../ssleay32.lib
-
-    # The Kitware FindOpenSSL module has been modified here by High Fidelity to look specifically for static libraries
-
-    find_library(LIB_EAY_DEBUG NAMES libeay32MTd
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static"
-    )
-
-    find_library(LIB_EAY_RELEASE NAMES libeay32MT
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static"
-    )
-
-    find_library(SSL_EAY_DEBUG NAMES ssleay32MTd
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static"
-    )
-
-    find_library(SSL_EAY_RELEASE NAMES ssleay32MT
-      ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib/VC/static"
-    )
-
-    set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
-    set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}")
-    set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}")
-    set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}")
+    # Using vcpkg builds of openssl
+    find_library(LIB_EAY_LIBRARY_RELEASE NAMES libeay32 HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib")
+    find_library(SSL_EAY_LIBRARY_RELEASE NAMES ssleay32 HINTS ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES "lib")
 
     include(SelectLibraryConfigurations)
     select_library_configurations(LIB_EAY)
     select_library_configurations(SSL_EAY)
-
     set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY})
-
     find_path(OPENSSL_DLL_PATH NAMES ssleay32.dll PATH_SUFFIXES "bin" ${_OPENSSL_ROOT_HINTS_AND_PATHS})
   endif()
 else()

From 984503ce2937eeb7caf2804f39c292436d9edce4 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 31 Aug 2017 11:55:53 -0700
Subject: [PATCH 53/78] Update build instructions for vcpkg usage

---
 BUILD_WIN.md | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/BUILD_WIN.md b/BUILD_WIN.md
index 1a33088237..659699940e 100644
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@@ -27,11 +27,20 @@ Go to `Control Panel > System > Advanced System Settings > Environment Variables
 * Set "Variable name": `QT_CMAKE_PREFIX_PATH`
 * Set "Variable value": `C:\Qt\5.9.1\msvc2017_64\lib\cmake` 
 
-### Step 5. Installing OpenSSL
+### Step 5. Installing [vcpkg](https://github.com/Microsoft/vcpkg)
 
-Download and install the Win64 OpenSSL v1.0.2 Installer[https://slproweb.com/products/Win32OpenSSL.html].  
+ * Clone the VCPKG [repository](https://github.com/Microsoft/vcpkg)
+ * Follow the instructions in the [readme](https://github.com/Microsoft/vcpkg/blob/master/README.md) to bootstrap vcpkg
+  * Note, you may need to do these in a _Developer Command Prompt_
+ * Set an environment variable VCPKG_ROOT to the location of the cloned repository
+  * Close and re-open any command prompts after setting the environment variable so that they will pick up the change
 
-### Step 6. Running CMake to Generate Build Files
+### Step 6. Installing OpenSSL via vcpkg
+
+ * In the vcpkg directory, install the 64 bit OpenSSL package with the command `vcpkg install openssl:x64-windows`
+ * Once the build completes you should have a file `ssl.h` in `${VCPKG_ROOT}/installed/x64-windows/include/openssl`
+  
+### Step 7. Running CMake to Generate Build Files
 
 Run Command Prompt from Start and run the following commands:
 ```
@@ -43,7 +52,7 @@ cmake .. -G "Visual Studio 15 Win64"
     
 Where `%HIFI_DIR%` is the directory for the highfidelity repository.     
 
-### Step 7. Making a Build
+### Step 8. Making a Build
 
 Open `%HIFI_DIR%\build\hifi.sln` using Visual Studio.
 
@@ -51,7 +60,7 @@ Change the Solution Configuration (next to the green play button) from "Debug" t
 
 Run `Build > Build Solution`.
 
-### Step 8. Testing Interface
+### Step 9. Testing Interface
 
 Create another environment variable (see Step #4)
 * Set "Variable name": `_NO_DEBUG_HEAP`
@@ -65,16 +74,20 @@ Note: You can also run Interface by launching it from command line or File Explo
 
 ## Troubleshooting
 
-For any problems after Step #6, first try this: 
+For any problems after Step #7, first try this: 
 * Delete your locally cloned copy of the highfidelity repository
 * Restart your computer
 * Redownload the [repository](https://github.com/highfidelity/hifi) 
-* Restart directions from Step #6
+* Restart directions from Step #7
 
 #### CMake gives you the same error message repeatedly after the build fails
 
 Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.
 
+#### CMake can't find OpenSSL
+
+Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.  Verify that your VCPKG_ROOT environment variable is set and pointing to the correct location.  Verify that the file `${VCPKG_ROOT}/installed/x64-windows/include/openssl/ssl.h` exists.
+
 #### Qt is throwing an error
 
 Make sure you have the correct version (5.9.1) installed and `QT_CMAKE_PREFIX_PATH` environment variable is set correctly.

From 71a403f03fb125894aae723bd5be12b060535a2f Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 31 Aug 2017 11:56:27 -0700
Subject: [PATCH 54/78] Update BUILD_WIN.md

---
 BUILD_WIN.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BUILD_WIN.md b/BUILD_WIN.md
index 659699940e..eea1f85e5b 100644
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@@ -31,9 +31,9 @@ Go to `Control Panel > System > Advanced System Settings > Environment Variables
 
  * Clone the VCPKG [repository](https://github.com/Microsoft/vcpkg)
  * Follow the instructions in the [readme](https://github.com/Microsoft/vcpkg/blob/master/README.md) to bootstrap vcpkg
-  * Note, you may need to do these in a _Developer Command Prompt_
+   * Note, you may need to do these in a _Developer Command Prompt_
  * Set an environment variable VCPKG_ROOT to the location of the cloned repository
-  * Close and re-open any command prompts after setting the environment variable so that they will pick up the change
+   * Close and re-open any command prompts after setting the environment variable so that they will pick up the change
 
 ### Step 6. Installing OpenSSL via vcpkg
 

From 8d21b286b45f294beaab3300683f753b4383adf6 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Thu, 31 Aug 2017 19:34:01 -0700
Subject: [PATCH 55/78] string fix

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 88003bb10f..c67ad991d0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6360,7 +6360,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
         }
     } else {
             methodDetails = "UserDoesNotHavePermissionToReplaceContent";
-            OffscreenUi::warning("Unable to replace content", "You do not have permissions to replace domain content",
+            OffscreenUi::warning("You do not have permissions to replace domain content", "Enable 'Replace Content' in the domain server settings to continue.",
                                  QMessageBox::Ok, QMessageBox::Ok);
     }
     QJsonObject messageProperties = {

From 7eab80e49467e7ced186e75611c5cd7e4ca7004d Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Fri, 1 Sep 2017 13:17:37 -0700
Subject: [PATCH 56/78] change message when permissions to replace domain
 content are not present

---
 interface/src/Application.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c67ad991d0..ceb4a75133 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6320,11 +6320,11 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
 
 bool Application::askToReplaceDomainContent(const QString& url) {
     QString methodDetails;
+    const int MAX_CHARACTERS_PER_LINE = 90;
     if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
         QUrl originURL { url };
         if (originURL.host().endsWith(MARKETPLACE_CDN_HOSTNAME)) {
             // Create a confirmation dialog when this call is made
-            const int MAX_CHARACTERS_PER_LINE = 90;
             static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
                 "If you want to save what you have now, create a backup before proceeding. For more information about backing up "
                 "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
@@ -6360,7 +6360,9 @@ bool Application::askToReplaceDomainContent(const QString& url) {
         }
     } else {
             methodDetails = "UserDoesNotHavePermissionToReplaceContent";
-            OffscreenUi::warning("You do not have permissions to replace domain content", "Enable 'Replace Content' in the domain server settings to continue.",
+            static const QString warningMessage = simpleWordWrap("The domain owner must enable 'Replace Content' "
+                "permissions for you in this domain's server settings before you can continue.", MAX_CHARACTERS_PER_LINE);
+            OffscreenUi::warning("You do not have permissions to replace domain content", warningMessage,
                                  QMessageBox::Ok, QMessageBox::Ok);
     }
     QJsonObject messageProperties = {

From b5faa8ac567518aac7af91211263f52fb56ec337 Mon Sep 17 00:00:00 2001
From: beholder <elderorb@gmail.com>
Date: Sat, 2 Sep 2017 18:20:00 +0300
Subject: [PATCH 57/78] 7382 Create Menu does not Work on Tablet

---
 interface/resources/qml/hifi/tablet/TabletButton.qml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletButton.qml b/interface/resources/qml/hifi/tablet/TabletButton.qml
index a45390b3d0..58091d9fab 100644
--- a/interface/resources/qml/hifi/tablet/TabletButton.qml
+++ b/interface/resources/qml/hifi/tablet/TabletButton.qml
@@ -3,6 +3,8 @@ import QtGraphicalEffects 1.0
 
 Item {
     id: tabletButton
+
+    property string captionColorOverride: ""
     property var uuid;
     property string icon: "icons/tablet-icons/edit-i.svg"
     property string hoverIcon: tabletButton.icon
@@ -102,7 +104,7 @@ Item {
 
     Text {
         id: text
-        color: "#ffffff"
+        color: captionColorOverride !== "" ? captionColorOverride: "#ffffff"
         text: tabletButton.text
         font.bold: true
         font.pixelSize: 18

From c62f9007e9571ac0d164c5a8d5427542aed616cd Mon Sep 17 00:00:00 2001
From: beholder <elderorb@gmail.com>
Date: Sun, 3 Sep 2017 15:20:59 +0300
Subject: [PATCH 58/78] 7196 Mouse pointer no longer visible in HMD mode

The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.

The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
---
 interface/src/Application.cpp      |  1 +
 libraries/ui/src/CursorManager.cpp | 14 +++-----------
 libraries/ui/src/CursorManager.h   | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 88003bb10f..7e1348e172 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -604,6 +604,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::registerInheritance<SpatialParentFinder, InterfaceParentFinder>();
 
     // Set dependencies
+    DependencyManager::set<Cursor::Manager>();
     DependencyManager::set<AccountManager>(std::bind(&Application::getUserAgent, qApp));
     DependencyManager::set<StatTracker>();
     DependencyManager::set<ScriptEngines>(ScriptEngine::CLIENT_SCRIPT);
diff --git a/libraries/ui/src/CursorManager.cpp b/libraries/ui/src/CursorManager.cpp
index 106574ff4f..8eb4989ab6 100644
--- a/libraries/ui/src/CursorManager.cpp
+++ b/libraries/ui/src/CursorManager.cpp
@@ -24,13 +24,6 @@ namespace Cursor {
         return _icon;
     }
 
-
-    class MouseInstance : public Instance {
-        Source getType() const override {
-            return Source::MOUSE;
-        }
-    };
-
     QMap<uint16_t, QString> Manager::ICON_NAMES {
         { Icon::SYSTEM, "SYSTEM", },
         { Icon::DEFAULT, "DEFAULT", },
@@ -38,7 +31,7 @@ namespace Cursor {
         { Icon::ARROW, "ARROW", },
         { Icon::RETICLE, "RETICLE", },
     };
-    QMap<uint16_t, QString> Manager::ICONS;
+
     static uint16_t _customIconId = Icon::USER_BASE;
 
     Manager::Manager() {
@@ -62,8 +55,8 @@ namespace Cursor {
     }
 
     Manager& Manager::instance() {
-        static Manager instance;
-        return instance;
+        static QSharedPointer<Manager> instance = DependencyManager::get<Cursor::Manager>();
+        return *instance;
     }
 
     QList<uint16_t> Manager::registeredIcons() const {
@@ -76,7 +69,6 @@ namespace Cursor {
 
     Instance* Manager::getCursor(uint8_t index) {
         Q_ASSERT(index < getCount());
-        static MouseInstance mouseInstance;
         if (index == 0) {
             return &mouseInstance;
         }
diff --git a/libraries/ui/src/CursorManager.h b/libraries/ui/src/CursorManager.h
index 2a92cc7f45..02ab99ee4b 100644
--- a/libraries/ui/src/CursorManager.h
+++ b/libraries/ui/src/CursorManager.h
@@ -8,6 +8,7 @@
 
 #pragma once
 #include <stdint.h>
+#include <DependencyManager.h>
 
 #include <GLMHelpers.h>
 
@@ -39,7 +40,15 @@ namespace Cursor {
         uint16_t _icon;
     };
 
-    class Manager {
+    class MouseInstance : public Instance {
+        Source getType() const override {
+            return Source::MOUSE;
+        }
+    };
+
+    class Manager : public QObject, public Dependency {
+        SINGLETON_DEPENDENCY
+
         Manager();
         Manager(const Manager& other) = delete;
     public:
@@ -52,12 +61,13 @@ namespace Cursor {
         QList<uint16_t> registeredIcons() const;
         const QString& getIconImage(uint16_t icon);
 
-        static QMap<uint16_t, QString> ICONS;
         static QMap<uint16_t, QString> ICON_NAMES;
         static Icon lookupIcon(const QString& name);
         static const QString& getIconName(const Icon& icon);
     private:
+        MouseInstance mouseInstance;
         float _scale{ 1.0f };
+        QMap<uint16_t, QString> ICONS;
     };
 }
 

From 99a99ce71b8b5ed049107d6cf5c1115431e12d55 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Mon, 4 Sep 2017 21:14:26 +0100
Subject: [PATCH 59/78] WL 21513 - Update text in the "How to Quit The Sandbox"
 Prompt

---
 cmake/templates/NSIS.template.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index de79b49a74..8e05372f8f 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -964,7 +964,7 @@ SectionEnd
 
       ; the process is running, ask the user to close it
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
-        "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \
+        "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
 
       ; If the user decided to cancel, stop the current installer/uninstaller

From 0e57df54831ae8e82af0f16e637a5f4b41177e60 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Tue, 5 Sep 2017 18:54:54 +0100
Subject: [PATCH 60/78] Deleted unnecessary file

---
 Test Plan 2.docx | Bin 7305 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Test Plan 2.docx

diff --git a/Test Plan 2.docx b/Test Plan 2.docx
deleted file mode 100644
index da60821b53e86ea9383e166da7f1d63dba588740..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7305
zcmaKRWmp_ru<Z=)GC0AVfeh{r!JXg`Ah-_h?(PJK5L|;3+yVp%8XST{a6$-f@8jGf
zIeGV<+P}Jcuif2My{dYzQjv#+!v!EAApuHpfbxJ}3<LlG-0huAS)i_V#%4}dPz#8M
zoo!K)7&Mp_OHz44fZ_y4hCm}!yxwve+G^t+5XolLf1zyxJ9=~w0(kxgET@Gu@OXc+
zZtqU6D;Y~cKWS=PucS?b_DMgJ-Q>hxxxyQt50eftRLb;_hGa=-*>-7q`i6obI~u09
zS^X?VV`Ygmj<h-i;e!;D0wKN(v5!X)`>g1v#rM3{s0L((Ne{TIbVH<V#;hh>89$@6
zt%i_E@gJCFYZ+(==A^6h_&Re;<J)I@ucA#9#6!_6^=YdPth^YXqg9Yi-MK|dRXph1
zd~4o@vzxEi%u$U_(G!PcqZ(d*b)bMI5uplFBlKq@tqR@J5El}$esfb04Zh^}Fidk3
zizOg(U!TsV__`}ehP3;W1D<*Qn^wo0dR;+ExHr{S3|k<$>Hr^16?r6-Yt^lIBVxkg
z?6mrQLCS5A9E?!v^!?sAG)eZA0aJ}};hV<-A)MLNe$2Nj@`y<E*|lG_fdD`o8~~v5
zf5rv-uedmyxwu$CEu8-dOUk5DB`a3g+qHJsy?aO{8<~V@$HZ=|LDe^)`4UX5T}cMM
z!|DnZ>TYh|nwR8j^G<*MyNs+Qo`Ph}BrQwSCLIgr#MA<nCh&Y$TKEi?ybpj$wBQZA
zfXq1bgFm!&c?8QiRhg>iX8C*23}v&RqEK}auuF>G4lPv%LENVZ%q3bKtLMmx5wyru
z)l1niSjXhnXVgPnca2@k9);t@EMb^rq63D+$JYj>?qbkh4nCu{yHZh*-JgfmHDvlG
zoynJmAAF8v)z$XG=4bj`3$1lfUUV?G7uJ442=&&~?bW#-l2V^ylTm<>ak=(XuhwWS
z4(zZ}`U(kso~$=%W4y$z=qN#k#rk=YRM<rFBF@D6BV;Yc)9<~zbz-zKQZ1O1ljsKt
zTy<bC(!@6`&L3Kg$K6e=89M6Ghd$yU6fg`&*7W1<IJ6F@?a<o6saT_{KnTPgXSWFh
zstb_{CzwBhX)PSliy*u4PONRf#1t?WJ__^Y+OdP^2<oy<elVP!<Um;nCsrE~IHLWc
z!;v$$c|rOVRY|0qt~4M3U;_VNQT>~3=Jrq*_1DI>X8#jbF{O`BZ0jbaI$0`Y#)`_+
zj6mUzfKP!{Af>Oh_O7f=o><y!l0~Ts5!aDCz3LJn^Y`q$n+99M@kP>^)LZpZz2@DS
zN+G({7EwIb*%C}A!6i<t&2g}8Y0mgy6*$nwFc>S(HLktgp}0AJDrf2NvY|J`IIyrM
z+z@Pn-cWTEQqZ)vEd}0lKebC*uEhu@su(IHHO{A{chSD;py|&~(06%jAZFqdpM>{A
z7j+Xejtv>lOLP-#^-B56+?06jKIN!=xMjosWuse+p3+2E+r+-*G}U%$0_wNk{e5kc
zh<ejLz-5FOTXE>yTwnSpw%wX$2O^wUeLoI!6V1VJ$_#yJLd=(HuoV{ImiDR}@9ggV
z2PgHYaU`*A8)6tw^dK$KPQ+3hB$R8-Kj_w*omQ~nBQ;E$0(XO}c3F~@Lu=vaS=}9l
zQ*}pvlu^@UJJ}(unngT8>4ixnR(oaa`@GR%vcj@}XWHmOVB>gQ*9Z6%IAsyW_ntri
z;O0N+i1{}iT|8~g{vhL#)&g{i7xzBs8d2gT(stpLP%4MYb;2z`L3cXCvnz=q8eI}Z
zV>WYrla$0TqAOUALqU{x5!~07El)-U@w$AF7MBvBp)q&aR)BmOLz)Z-O^0fYiC~hm
z;E&0G^C+>TCWjZO_u9K2HeWTRSSu%x?D>GxWNVy^i>{_z&9DmKwrDpatS$Opz{v6R
z&nk)v7T-}BAtQ$RD%32tt#}B!%Mms?sfnf0_DKf8_RvJ9$m-NF^a8=;+!APIdWFk%
z6pC0Ho|0M=`M2GrF>Go0&-n-x1x!%u1h^tziQDQAgsY>%n|iT>)NqH>ky?y^Nosob
zs1~8TM3@v4qUuBvtq%HME@*%XOoY_22r3%4YI6|Tk#`udd=8XD330gZ1rAZMZrxbc
z(1Z`JNifwMVZ|)U)YXFo5vd}?7*IvW#3-0OUaS-EVu0Dgm&BZ)6rqGoFiF8O+bpAp
zrppN<bO>=6mP_B>`GT0Y#~N4s#POH&k<{`Ft)i;)ZBwi6P7_sWr58Y^0jI+)*n|yR
zb!HSc=x}OZWze`@`be1Joe(n^>bd7>@Iw}xCsUEJ>JT7VZnWR2tqEbJ(o1cxt7H7?
zG{@^x8*LZWZ1TM1AqrlIT0C&}Wv<s0*gdm~0njQ$RTF3Vq-8qS_67EM>5wa-n|H*U
ztUCg)3i)=?!kP7Kj^U|ixfu2DB+{wD1C7#7NC~nWC(7IMY@GTaWtGA($r}a6RJ3S3
zk7t;nl3<Al3}iRV&1A>Y9BjHp)G}iYOHr%{Cny)$7(D`2=nLds>JEN8B92h6jmPYz
zfe$HppxOyaE>|>JGb!P^A40w2<!vPSYGfK-WG^YQ$~}B{IuU1$D2~$Q-c1*+H)$IA
zkxwjGkGl$C^d3?Rjt#ND@9KTyY=4pC6B;U6JQ*rmoS+^Zf-fd{B-n^v-A%uXbkn1a
zu>LKv;1;OSig-#C*h1DAxY^4FE`p{ST@~pjh6nLiG^Ore<Zg5C=|GdoNEO?uX-5Y(
zq1VkC{Z1bR4@K%7y&oBE8*?^E7TXOL+j*pxT!d4acGey892aY237RaXc#n!4Zx%Tr
zaXLT8%uaVxvK2?WT;(AAN<;mq69NZC?iWqF=lBwPLix_QkGd{n{JYs5fE=w37lRHq
zehU^^ixbl043{zQz3fNBy*~6ct#_9|Cf^FnuLMp9OlSNjozF0Y$E*1VTfOjgvZl3i
zd^F;;if#9E`WI0BIJreYh!I|kjwhKI?e6FLQPI)XCS?0_+wFNjWZC@g>)5VWwJ(5{
z%{|JcJq@wi98=`AQXzNf`MVydcNL{xM>Y{d7Ie9BJz3a~`z*`J*em|V9`tNK;%S8n
zzW_7etN>t2fH9Bi!jfSPe(r8l&y_7kz_)4eTle@A_CQyZ!Oo$BKg#|j;>|V_8~`9o
z_+JI$@3L=dZ{lia26cI=4@Wt#oR)Y&0m?P*MtfEtz}%AipQ3EC%VIc)?B68IEv#%g
zqELxpv&pam7<4={gAa2}RxcTxli+0%ZrHZpom<FRiD*;F+|^9pyTVchzV-8qDCHW^
z$HF&k$o}Fs(p&q<2NVy{eQfpiXSdW5&!3l0>A%Y7>d!wv%j&x4<h#sBlj2QH1ykaG
zOLU(^DN-1-)AOK=OW-v_j++?@I7O0m9h7zpx$@1-_F$Gvppg)d%wB}HeYMXpo|k0W
zK5b##prInO2!dC$;Ij}D6|@zOB57CZ@Jw|t9@2^B{-oX**iS_h$siX!`&=;xEn0j)
z`D-6<e!pvSp^}}jG|mhu_9#;(>oI+{r#8}?8;FQb>TZJ#k_v(9PU)ABe*Wmx7ZH7C
zY`T1@DBuHO4cBMy%p^ylrgW%c2b?q_u8LtKr+b^4d0bn3Z$&5@8$8P3-pCiXs}H(H
zeHZUDQw6*#fg5i3J~Yhth><h9kZzpzETegwhb=v+AlqN>HEYFEHewe65@fP#(6Q=r
zOr@*hK@pYMQ9idYRvg3Yy32~zT)Jyim=aJRr}y*9b~(d9WGJfJ_)IUHmacIbd4L(;
z4-y%~om_(REPoCDNVvDJ+ax@GHWDUTmrNghA}Q{!Qm7x*&$+bKG%|ek^75tQYP?>D
zn6tXMEWz;@WMpL5ACdx>a!pTy`uS7y`3?rEm2W=7Y}&A(gr7+4NlnI!Wt7O~w&Ohh
znd(W(S)gm5R<+EUDeiEc`(X~!U8!V?dl_kviuuiU*)IB7X8Z9^@+Fhp3#xX5ui0EK
zHwf{OWI%1L7cv7SZ@`f7X`l4Eu%DVrjF9qH35h60fteN-@GJPV;GTmOE4Kot%u=~~
z#D-;bT*SK17tud1ta+12*{Vdz3My0LAfFn9A0NK@4536JkB&^zzRz$SEHs_W%-}Gp
z%1G;z!~Q-a)gn^;X33A{in2rMW$JL<9L$e^`?~n|L~Sg1m8;Nk6h^L19wnc9*Fs?y
zqEXi#SN;J6f+W(*O0C4@J#~X4{(H9t(5q3ih>gTq@r{G5B|X@~7O%siS>{{~L+2J;
z&B5xL$rOdK4!>FYbw#;1m5J>GGK2Y1RPkw#EOEK^^cH4a2fUdZ-!kM}k8ftxa=My&
z)XhGmZLj%?`p{v0tvzz1_5Q3V;wb59qOAXt({G#BZGp~v))nyt_j30*_h@j1GLk7f
zO{o5DT4R1J2}U|r`oyu~uCp)^nkJkkoMuBOb#Lz`O`?(P)5y}ET2c>-sph8g=5F=6
zW}8KD#%As2x3;kzgKHAtbzLkOTY%nA$&U^P61A5SEt_QfsJqn^-t%8)_GvR0DMyUc
zr476A7RZ+*8Q$?x&S_PDv;4wQ>~eq`y$!e7Jl214`0!%4A{qE@pIMHUiRGL@YQQQQ
z#K@qMyNt`*2i%n8O4+4nU9R_YG$P4?On$~X@M=g<h&vqnd>P<CSzS*Rb9Eq1P``J(
z!#c)i2fG5W58&xuV%s=MGNI8Z2z2b`H6me!R>TNY?!D9dEIohI&3ijGz$y=C3*Q8z
z_iSV~tS??;yheNt$pN+*xD0>-cmkevqpu<Sb@(AI{MqMKAOkQ3AP1m*5%~M{zoy$j
zmW>`TM3M90RA3k=QQ-d9#dreroY&2FPJT*vq6t>ko%`qnO@AiB8h%$kC5YK}Z-(M_
z%f;8capXTwx>t0=r87Ugi9+20o5z7Fk&B)4c^SHH-4;Bx0J)tT#Vax<PdSdV(+P|D
zdO(U~PrE_)-naVAT(h&QN9=F`p=5bc*CwN)r~BRWtIPp@zE#uST$bax&vZLVhZ2-p
zD;LBld)W}n4Q`!FgY#-A1&EB2ph^J5=zASOKZ_o%LZ_mvPIo~5u!0f<Rt~c_QB_?`
zipf4UA;Pm#9z;SvB9$>#es!%Z#PI#4eShzl*xu+iN&^M;E{SFrFeiiZ5{7<IqQpQ4
z@&g@R4h&=r+|278JhH!JfC|Bw*xuf)o9Vnu`4JLXPO6!S6`$KUNAe~siw;$M`E|Bz
zs@K6awrNC_)1%o7#w;Y8kRk)ngm|r_PmG(nb5^WDCXFQLv|hF>t$g9#cDhXdVNQRl
z`e{pQp>VRp1)g`EBe6)ymhRC(IbVz=`4EnH^6*5+OSTNqoMSLHqd1PchUEsCwdIDm
z<&U(c@&`BCBBAp$mccf1$J7D8;AYr{2i1;MJfhH9Z@fZPs*>4N2~dK+_KV#?bZVs%
zdhvX0&DRkG12J`z)A^Q`>)~+D`P7|<D-mc_;~@vPjh(DYzB#KOgjch<OFwjf(7c&l
zq1hiGeY7F>zeHJG)Y;Y(2;bKeSkv<dta=^P7M9__ymI#x&vW)z5syE|j%3DXMpJma
z+gwHU+Zq>nFnLGwu1~`2SnC#Nh?%8t#g{EX<KZL96mQnE+5TP73=#J<wZ5|$H^P8$
zqQa{Yk7*ivC!bd~H_qY=jbY{StaI$2IwdzMZE*b?{NvNBdjnM@Ysx<+`h(c3r$Ynk
z8BUC(jLU9a6mZ)VR*h-v)MqqF#;s(Mz3}~f^|2Y-AC6Tn4X(<9=_Cs$Ug0siT;em@
zp3^fC`1#se=GDwVJ9}2udTYtLk&bkk6}u4Fb|;hl&Vm&#zxzbz`-;|(5fEFb9eq0&
zDixM}j$M~>gKq|7k%stLekNTFvx(WXf3ai>K17DWBGg3Qs64I~Gj|IhIJEWb+gGKj
zXJ|pH>#|-Ig0d&9Lb8a0L$!jRl7y(;nfQ`CIPI_uF+KsccgB&bRU+QZbu|t|;4qhX
zRVEY|;3|p5DhhUNlUx|;Bqw;h7B(GnGVk=+qyG|>xRV&ejtRlAoZ1qSK^M<_9>)0*
zf{B31i(PO!M^(62jbe2ZPBi60S;&`~u!De_>Vz4MP`f>tO{!2z=F%0kMUilg4NEj0
zpKL!(8sWD~5cqkaTy*D<6*hwmj$Nde`LX2A)9L{B-SFGG=Gw`zg*BN4=*qYjIo(+T
z#NiSHosoOosLa{0(l#=tXU(<Ri72)l4^_SCqt0R>mGhCSBKQYL5}w@9F6H)2x8+DW
zh#YLlK6Ao~+ku~ec$ntvQspCErh4z@ttnGR)aAHwP)&XAnem*CeNtJ?CFVT~O`DQg
z-C66`3OO=dtt@MZ1a5qdMms~>2ZVX&^LhCy9YKNX=zc53h}zA5tBSOZz;i4Ah|qxj
zYVyt3uC)GC0lp-e$IPi7P2a!;um>2Cw<tX3%1up$v*s5Ki3dOv7?Z^gwtM1IY=@a-
zPNNr3gNxi`yx3-iQs<mmfDl9oB2-hf$G!D`Ep<^it4X2sp(B2M7U2tsb(Y^c*mms2
zDwmuI%V$6PpE@BjK1n%i3(wxZ_(-L~XK-YDe6@hCnIC)3Tx04S>t~irS+6paY<{E0
zMQ1w|Um9LOQ3K`zINjc0R;Ya}pZ+`V{++d#xYsnDK@KAE`nIC7>99{}7?_e3_`~VE
zkD)I-K&YF{=!CEqG1&08{7xO9H=5DG;n9vMgIoxwM#jg;VpG}uey)@;tzZ(lY~on}
zbLBWB3hzpt&qF~QyxSm)DIe4l*uvGl40Xt_q^W-vpRdl)@2uQvME^9-+^D`2I=^_H
z@!THv0(b$uV6!KGygeB+DCR5PE+;-4n550;JiEauDz4OjUu#?sYeZUup^aE6U^E-5
zU_TYa9EW>A#UVCPI22HFF~!$xcF`?}@kP+Mm<rHoN;8|L!bhrXnC}XGZ9-iy<#LXX
zSN$WS)km7P{<&1dz<iWWr-s^_`<|1I?@R;cG(sc_y=NGCk4tm@gj79P$bZ*0?{K}*
z@Rl_$MF4F8Nc4I$2$V1SZ^!&q*kGG`?nwWvfWtfgHLv6DF6V)8Dvcv$>*@dNcprt@
zaA-b5XM`ihvY0efDt+h^n5*>kLcVxJvd(JikoE(#OD3aZE42i#gZ*UyrO74s#^tr<
z1d-pWjUtC`2}ZT5CvJgE<4^ao;ChF{R;4vp7xq&Y-QZs6*@oY!y617<*u{R8^O8-e
zh5zYjlb!A`TgPK_Jpsk#^k{j`i)v(!!e;9)Ko204G=>Ld{y40g``9PE`B;74G`ERV
zzl4z*?B(Hbr&Qg2exT9p*TJJ--FejLa0IBf5Eqy5u2xvFHe6X_>q$m%gtzqBQp@UR
zi*AC2fop^<>xh`f52dQ1SB&9loiU(SS1RS%HQzpv<(WIePgX0yl=%R8D>k*l-X&LO
z>XtBGiz{uOS;UK`v6eo*mJTCQJo%M#GO%dkb=s-_MWs&D`?0s?hCVw**m2ugkFZa=
zPLA}{3L82AU@i*$51EzZFI~sb$;{UIU%M{I)0wIyd23iUv@qof0m37JT$-X3kTN%I
zf?Wn#cgCb(#PetJj5$klxIcohTGNaC3Y6a_%w>_EO!Lr@!4hfX(lQj%HBg@;bnYLW
zJ!8O^uW}8X=ng^4+PAuo9Fsd<e;rfF9x~re0a|U`F&DLOLBeM2a-sBOYEkHjYvP+H
zJFjClbZs>kb^WN`HY>W=h^lgqdn$4`;c600{*KR!riDYCBWkOkm&0yf6)ii7s$O(e
zOM9$r0zPT+nACt|Y?3;1CL84P(_6vwB)X5!i{_O5fX&p&!#AqyhSOlxr)Hnv$yFwy
zIi%|V0H74+zqY2R007{By!3}>V#ftAdRfsB)^Hrc2L%*I0<f&7;3-`tw*jgf#n__~
zvK~J#OpO42-IlkP7A;3)Zge~`Lmr><%B(4N3$+HU5WcN9uK;CrcxlZ~5_*D=`8%zZ
zd875+rcA}D;2k4-Qk>^sW^RRO77io2n6ckjN<z%0IgvcEiT8@%f8gwV)-9qi#e`6+
zg`V&l`6~YC)1-``hiBvNk9ZuzNUG>kHjd`o(o(O+ie8xQ=l33oB7cZ|&n?HPY5@QM
z82DdriUR-u^d#(|E@n^{Lv>FFGv`-N+wjI@#V46I^hu_*SKa7^p`30&^-Jx}Co$Sr
z&_#V5;$S>F%4ndBE|;kp9NXkMTltnKXn5Sg<d!}(pi+@#U5tW8$IWePeO~Luc%mVO
z_6|q@JG&oHm>OMiy`PYPLWH4S@!Z*KBJ(r8kP03Sg6d+rP)&+w0ZzK|d|qeH=y5}2
zAe+NbN4W0iw>6<-j;9{2Csj7^jC?i$q4Log;M_~9T-ICN$JbDTOpbIXKpA_h38tN0
z{=peQwM^L~dDL`it&7TdNjF%LGbb%^pJ|6~+cH5Wb^n#*Aae=jIVpQr5P{xT_kHq4
zVlqB-7;=&a1czz5So?k(c$@GvWGPRzh>2@1b3Vf`!fjbfss3Q}G_iryKne1$m5pal
zUlQQqc#Iqf0JOqB`4<R-3;3t&^lRVaNeBP8{r^3v-|@dH>`yYuKb8*svxoI-ujF_5
zuR8C)Zx4n26aFtz{&)PZ`puIX{EyMY|8@Jnwc+2vzb2!9KYKj#pWt5wpWorX67(r!
z{bP^#f5QKd{Pp`vzY^ey(Ek{i@L%-)9r$ZxpZM{Q;S&9?Y*CSiM|hfq1V92j0s#OQ
I;wQ-e1EA-uc>n+a


From c0e7e5a8b2fa4c3e26cf500e0fb7cef45e483633 Mon Sep 17 00:00:00 2001
From: beholder <elderorb@gmail.com>
Date: Tue, 5 Sep 2017 21:26:35 +0300
Subject: [PATCH 61/78] 7385 - Collect Stats on "Exit VR" button

---
 scripts/system/hmd.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/system/hmd.js b/scripts/system/hmd.js
index c9c3dbe493..b9fd7f725c 100644
--- a/scripts/system/hmd.js
+++ b/scripts/system/hmd.js
@@ -68,6 +68,9 @@ function onHmdChanged(isHmd) {
 function onClicked() {
     var isDesktop = Menu.isOptionChecked(desktopMenuItemName);
     Menu.setIsOptionChecked(isDesktop ? headset : desktopMenuItemName, true);
+    if (!isDesktop) {
+        UserActivityLogger.logAction("exit_vr");
+    }
 }
 
 if (headset) {

From 4bdfe092cfe8a35c0f181696831fe3f3901500f2 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 5 Sep 2017 12:28:31 -0700
Subject: [PATCH 62/78] Regression in injection script

---
 scripts/system/html/js/marketplacesInject.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 50ed642529..84c26d482b 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -134,7 +134,7 @@
             if (parseInt(cost) > 0) {
                 var priceElement = $(this).find('.price')
                 priceElement.css({ "width": "auto", "padding": "3px 5px", "height": "26px" });
-                priceElement.text(parseFloat(cost / 100).toFixed(2) + ' HFC');
+                priceElement.text(cost + ' HFC');
                 priceElement.css({ "min-width": priceElement.width() + 10 });
             }
         });

From 85a3771a98ff790717c2c6d5139e3f472b85b98c Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Tue, 5 Sep 2017 22:19:38 +0200
Subject: [PATCH 63/78] Remove commented out code

---
 interface/resources/qml/TabletBrowser.qml          | 5 ++---
 interface/resources/qml/controls/TabletWebView.qml | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/TabletBrowser.qml b/interface/resources/qml/TabletBrowser.qml
index ce74ae8c6e..8dbcc8f4f8 100644
--- a/interface/resources/qml/TabletBrowser.qml
+++ b/interface/resources/qml/TabletBrowser.qml
@@ -13,11 +13,11 @@ Item {
     id: root
     HifiConstants { id: hifi }
     HifiStyles.HifiConstants { id: hifistyles }
-    //width: parent.width
+
     height: 600
     property variant permissionsBar: {'securityOrigin':'none','feature':'none'}
     property alias url: webview.url
-    //property WebEngineView webView: webview
+
     property bool canGoBack: webview.canGoBack
     property bool canGoForward: webview.canGoForward
 
@@ -123,5 +123,4 @@ Item {
             break;
         }
     }
-    
 }
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 9bb5000d7e..23143db3ba 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,12 +1,8 @@
 import QtQuick 2.7
-//import QtQuick.Controls 1.4
 import QtWebEngine 1.5
-//import QtWebChannel 1.0
 import "../controls-uit" as HiFiControls
 import "../styles" as HifiStyles
 import "../styles-uit"
-//import "../"
-//import "."
 
 Item {
     id: root

From 350cee5f35d471575509d9b0e314d48de87c6c36 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 5 Sep 2017 16:33:16 -0700
Subject: [PATCH 64/78] Wallet cleanup

---
 .../commerce/wallet/WalletSetupLightbox.qml   |  2 +-
 interface/src/commerce/QmlCommerce.cpp        |  8 ++++-
 interface/src/commerce/QmlCommerce.h          |  2 +-
 interface/src/commerce/Wallet.cpp             | 34 ++++---------------
 interface/src/commerce/Wallet.h               |  1 -
 5 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
index 2956dfb518..a623c2bcf7 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetupLightbox.qml
@@ -325,7 +325,7 @@ Rectangle {
                 onClicked: {
                     if (passphraseSelection.validateAndSubmitPassphrase()) {
                         root.lastPage = "choosePassphrase";
-                        commerce.balance(); // Do this here so that keys are generated. Order might change as backend changes?
+                        commerce.generateKeyPair();
                         choosePassphraseContainer.visible = false;
                         privateKeysReadyContainer.visible = true;
                     }
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 96f2a02f31..8681fcba50 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -86,7 +86,7 @@ void QmlCommerce::history() {
 
 void QmlCommerce::setPassphrase(const QString& passphrase) {
     auto wallet = DependencyManager::get<Wallet>();
-    if (wallet->getPassphrase() && !wallet->getPassphrase()->isEmpty()) {
+    if(wallet->getPassphrase() && !wallet->getPassphrase()->isEmpty() && !passphrase.isEmpty()) {
         wallet->changePassphrase(passphrase);
     } else {
         wallet->setPassphrase(passphrase);
@@ -94,6 +94,12 @@ void QmlCommerce::setPassphrase(const QString& passphrase) {
     getWalletAuthenticatedStatus();
 }
 
+void QmlCommerce::generateKeyPair() {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->generateKeyPair();
+    getWalletAuthenticatedStatus();
+}
+
 void QmlCommerce::reset() {
     auto ledger = DependencyManager::get<Ledger>();
     auto wallet = DependencyManager::get<Wallet>();
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index f66bf518f5..7d9317efae 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -53,7 +53,7 @@ protected:
     Q_INVOKABLE void balance();
     Q_INVOKABLE void inventory();
     Q_INVOKABLE void history();
-
+    Q_INVOKABLE void generateKeyPair();
     Q_INVOKABLE void reset();
 };
 
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 69327b09a6..8bdb8305d5 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -245,6 +245,8 @@ RSA* readPrivateKey(const char* filename) {
 
         } else {
             qCDebug(commerce) << "couldn't parse" << filename;
+            // if the passphrase is wrong, then let's not cache it
+            DependencyManager::get<Wallet>()->setPassphrase("");
         }
         fclose(fp);
     } else {
@@ -273,8 +275,6 @@ void Wallet::setPassphrase(const QString& passphrase) {
     }
     _passphrase = new QString(passphrase);
 
-    // no matter what, we now need to clear the keys as they
-    // need to be read using this passphrase
     _publicKeys.clear();
 }
 
@@ -413,28 +413,10 @@ bool Wallet::walletIsAuthenticatedWithPassphrase() {
     return false;
 }
 
-bool Wallet::createIfNeeded() {
-    if (_publicKeys.count() > 0) return false;
-
+bool Wallet::generateKeyPair() {
     // FIXME: initialize OpenSSL elsewhere soon
     initialize();
 
-    // try to read existing keys if they exist...
-    auto publicKey = readPublicKey(keyFilePath().toStdString().c_str());
-    if (publicKey.size() > 0) {
-        if (auto key = readPrivateKey(keyFilePath().toStdString().c_str()) ) {
-            qCDebug(commerce) << "read private key";
-            RSA_free(key);
-            // K -- add the public key since we have a legit private key associated with it
-            _publicKeys.push_back(publicKey.toBase64());
-            return false;
-        }
-    }
-    qCInfo(commerce) << "Creating wallet.";
-    return generateKeyPair();
-}
-
-bool Wallet::generateKeyPair() {
     qCInfo(commerce) << "Generating keypair.";
     auto keyPair = generateRSAKeypair();
     sendKeyFilePathIfExists();
@@ -453,7 +435,6 @@ bool Wallet::generateKeyPair() {
 
 QStringList Wallet::listPublicKeys() {
     qCInfo(commerce) << "Enumerating public keys.";
-    createIfNeeded();
     return _publicKeys;
 }
 
@@ -572,12 +553,8 @@ void Wallet::reset() {
 
     // tell the provider we got nothing
     updateImageProvider();
-    delete _passphrase;
+    _passphrase->clear();
 
-    // for now we need to maintain the hard-coded passphrase.
-    // FIXME: remove this line as part of wiring up the passphrase
-    // and probably set it to nullptr
-    _passphrase = new QString("pwd");
 
     QFile keyFile(keyFilePath());
     QFile imageFile(imageFilePath());
@@ -608,6 +585,7 @@ bool Wallet::changePassphrase(const QString& newPassphrase) {
             return false;
         }
     }
-    qCDebug(commerce) << "couldn't read keys";
+    qCDebug(commerce) << "couldn't decrypt keys with current passphrase, clearing";
+    setPassphrase(QString(""));
     return false;
 }
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
index 3b470210de..f72b7adc41 100644
--- a/interface/src/commerce/Wallet.h
+++ b/interface/src/commerce/Wallet.h
@@ -26,7 +26,6 @@ public:
 
     ~Wallet();
     // These are currently blocking calls, although they might take a moment.
-    bool createIfNeeded();
     bool generateKeyPair();
     QStringList listPublicKeys();
     QString signWithKey(const QByteArray& text, const QString& key);

From 1fd30b1e0fffa5fd26ce6b599efcab8d11a8196a Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 5 Sep 2017 17:03:11 -0700
Subject: [PATCH 65/78] fix passphrase reset

---
 interface/resources/qml/hifi/commerce/wallet/Help.qml   | 1 +
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 2 +-
 scripts/system/commerce/wallet.js                       | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 402209f38d..19273298b6 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -55,6 +55,7 @@ Item {
         text: "DEBUG: Clear Cached Passphrase";
         onClicked: {
             commerce.setPassphrase("");
+            sendSignalToWallet({method: 'passphraseReset'});
         }
     }
     HifiControlsUit.Button {
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 4fcfc0c93b..169060887a 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -318,7 +318,7 @@ Rectangle {
 
         Connections {
             onSendSignalToWallet: {
-                if (msg.method === 'walletReset') {
+                if (msg.method === 'walletReset' || msg.method == 'passphraseReset') {
                     sendToScript(msg);
                 }
             }
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 5f07c4cbe7..5a668a3d6e 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -71,6 +71,10 @@
             case 'maybeEnableHmdPreview':
                 Menu.setIsOptionChecked("Disable Preview", isHmdPreviewDisabled);
                 break;
+            case 'passphraseReset':
+                onButtonClicked();
+                onButtonClicked();
+                break;
             case 'walletReset':
                 onButtonClicked();
                 onButtonClicked();

From 89cda8d3062b7bcdee55b793f467551f40d4b6e9 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 5 Sep 2017 17:15:25 -0700
Subject: [PATCH 66/78] oops -- === not ==

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 169060887a..401ef89374 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -318,7 +318,7 @@ Rectangle {
 
         Connections {
             onSendSignalToWallet: {
-                if (msg.method === 'walletReset' || msg.method == 'passphraseReset') {
+                if (msg.method === 'walletReset' || msg.method === 'passphraseReset') {
                     sendToScript(msg);
                 }
             }

From 930243539cd01d1f6d3c210fdca95a309793c7a4 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Tue, 5 Sep 2017 17:50:25 -0700
Subject: [PATCH 67/78] add back first run to false and fix formatting

---
 interface/src/Application.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 233aa4fe81..79fb2a9061 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2776,15 +2776,16 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
         // If this is a first run we short-circuit the address passed in
         if (firstRun.get()) {
             showHelp();
-                if (sandboxIsRunning) {
-                    qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
-                    DependencyManager::get<AddressManager>()->goToLocalSandbox();
-                    sentTo = SENT_TO_SANDBOX;
-                } else {
-                    qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
-                    DependencyManager::get<AddressManager>()->goToEntry();
-                    sentTo = SENT_TO_ENTRY;
-                }
+            if (sandboxIsRunning) {
+                qCDebug(interfaceapp) << "Home sandbox appears to be running, going to Home.";
+                DependencyManager::get<AddressManager>()->goToLocalSandbox();
+                sentTo = SENT_TO_SANDBOX;
+            } else {
+                qCDebug(interfaceapp) << "Home sandbox does not appear to be running, going to Entry.";
+                DependencyManager::get<AddressManager>()->goToEntry();
+                sentTo = SENT_TO_ENTRY;
+            }
+            firstRun.set(false);
 
         } else {
             qCDebug(interfaceapp) << "Not first run... going to" << qPrintable(addressLookupString.isEmpty() ? QString("previous location") : addressLookupString);

From e9f666d970488c1e755a31751144d88b90940177 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Wed, 6 Sep 2017 02:06:10 +0100
Subject: [PATCH 68/78] Made the system tray message specific to Sandbox only

---
 cmake/templates/NSIS.template.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 8e05372f8f..cae2107521 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -963,9 +963,18 @@ SectionEnd
     ${If} $R0 == 0
 
       ; the process is running, ask the user to close it
+      
+      ${If} $displayName == "Sandbox"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
+      ${EndIf}
+
+      ${If} $displayName == "Interface"
+      MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
+        "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \
+        /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
+      ${EndIf}
 
       ; If the user decided to cancel, stop the current installer/uninstaller
       Abort

From 4d0df705a9a008176c91aecab19271c8141f80c2 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Wed, 6 Sep 2017 11:46:57 +0100
Subject: [PATCH 69/78] Forgot some {}'s

---
 cmake/templates/NSIS.template.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index cae2107521..86d52438c1 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -964,13 +964,13 @@ SectionEnd
 
       ; the process is running, ask the user to close it
       
-      ${If} $displayName == "Sandbox"
+      ${If} ${displayName} == "Sandbox"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
       ${EndIf}
 
-      ${If} $displayName == "Interface"
+      ${If} ${displayName} == "Interface"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0

From 14e5cf31f220db9f0e04566f341d04cbd4bef6ac Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Wed, 6 Sep 2017 12:42:17 +0100
Subject: [PATCH 70/78] Apparently I didn't need 'em

---
 cmake/templates/NSIS.template.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 86d52438c1..cae2107521 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -964,13 +964,13 @@ SectionEnd
 
       ; the process is running, ask the user to close it
       
-      ${If} ${displayName} == "Sandbox"
+      ${If} $displayName == "Sandbox"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
       ${EndIf}
 
-      ${If} ${displayName} == "Interface"
+      ${If} $displayName == "Interface"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0

From 2a6b5235426289bbd3c84219fc0f79fdf4e8e39e Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Wed, 6 Sep 2017 13:09:43 +0100
Subject: [PATCH 71/78] Again

---
 cmake/templates/NSIS.template.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index cae2107521..a68659f254 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -964,13 +964,13 @@ SectionEnd
 
       ; the process is running, ask the user to close it
       
-      ${If} $displayName == "Sandbox"
+      ${If} "${displayName}" == "Sandbox"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
       ${EndIf}
 
-      ${If} $displayName == "Interface"
+      ${If} "${displayName}" == "Interface"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0

From d429bd0b01b585b076470e1e090c7e5abb10103a Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Wed, 6 Sep 2017 13:42:13 +0100
Subject: [PATCH 72/78] Changed the Interface text to say 'Task bar' instead of
 'system tray'

---
 cmake/templates/NSIS.template.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index a68659f254..668270b9d3 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -972,7 +972,7 @@ SectionEnd
 
       ${If} "${displayName}" == "Interface"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
-        "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it and click Retry to continue." \
+        "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the task bar and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
       ${EndIf}
 

From cc3beb3d91fa48e82756068d8f3a42ee6e8253a2 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 7 Sep 2017 09:53:21 -0700
Subject: [PATCH 73/78] Fix potential crash on asynchronous QML loads

---
 interface/src/Application.cpp               |  5 +++-
 interface/src/ui/LoginDialog.cpp            | 10 +++++---
 libraries/ui/src/OffscreenUi.cpp            | 23 +++++++++---------
 libraries/ui/src/ui/OffscreenQmlSurface.cpp | 27 ++++++++++-----------
 libraries/ui/src/ui/OffscreenQmlSurface.h   | 10 ++++----
 5 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 748dc287ef..3650c495f2 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -7389,7 +7389,10 @@ void Application::updateDisplayMode() {
         getApplicationCompositor().setDisplayPlugin(newDisplayPlugin);
         _displayPlugin = newDisplayPlugin;
         connect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent);
-        offscreenUi->getDesktop()->setProperty("repositionLocked", wasRepositionLocked);
+        auto desktop = offscreenUi->getDesktop();
+        if (desktop) {
+            desktop->setProperty("repositionLocked", wasRepositionLocked);
+        }
     }
 
     bool isHmd = _displayPlugin->isHmd();
diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index c9341fd3d9..515215a8d3 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -169,12 +169,14 @@ void LoginDialog::openUrl(const QString& url) const {
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
 
     if (tablet->getToolbarMode()) {
-        auto browser = offscreenUi->load("Browser.qml");
-        browser->setProperty("url", url);
+        offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
+            newObject->setProperty("url", url);
+        });
     } else {
         if (!hmd->getShouldShowTablet() && !qApp->isHMDMode()) {
-            auto browser = offscreenUi->load("Browser.qml");
-            browser->setProperty("url", url);
+            offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
+                newObject->setProperty("url", url);
+            });
         } else {
             tablet->gotoWebScreen(url);
         }
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index c1120f1775..b4a07ecd47 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -554,20 +554,19 @@ void OffscreenUi::createDesktop(const QUrl& url) {
     getSurfaceContext()->setContextProperty("DebugQML", QVariant(false));
 #endif
 
-    _desktop = dynamic_cast<QQuickItem*>(load(url));
-    Q_ASSERT(_desktop);
-    getSurfaceContext()->setContextProperty("desktop", _desktop);
+    load(url, [=](QQmlContext* context, QObject* newObject) {
+        _desktop = static_cast<QQuickItem*>(newObject);
+        getSurfaceContext()->setContextProperty("desktop", _desktop);
+        _toolWindow = _desktop->findChild<QQuickItem*>("ToolWindow");
 
-    _toolWindow = _desktop->findChild<QQuickItem*>("ToolWindow");
+        _vrMenu = new VrMenu(this);
+        for (const auto& menuInitializer : _queuedMenuInitializers) {
+            menuInitializer(_vrMenu);
+        }
 
-    _vrMenu = new VrMenu(this);
-    for (const auto& menuInitializer : _queuedMenuInitializers) {
-        menuInitializer(_vrMenu);
-    }
-
-    new KeyboardFocusHack();
-
-    connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop()));
+        new KeyboardFocusHack();
+        connect(_desktop, SIGNAL(showDesktop()), this, SIGNAL(showDesktop()));
+    });
 }
 
 QQuickItem* OffscreenUi::getDesktop() {
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 84466f41b0..d29dc7a0f9 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -639,7 +639,7 @@ void OffscreenQmlSurface::setBaseUrl(const QUrl& baseUrl) {
     _qmlContext->setBaseUrl(baseUrl);
 }
 
-QObject* OffscreenQmlSurface::load(const QUrl& qmlSource, bool createNewContext, std::function<void(QQmlContext*, QObject*)> f) {
+void OffscreenQmlSurface::load(const QUrl& qmlSource, bool createNewContext, std::function<void(QQmlContext*, QObject*)> f) {
     if (QThread::currentThread() != thread()) {
         qCWarning(uiLogging) << "Called load on a non-surface thread";
     }
@@ -662,32 +662,32 @@ QObject* OffscreenQmlSurface::load(const QUrl& qmlSource, bool createNewContext,
             [this, qmlComponent, targetContext, f](QQmlComponent::Status) {
             finishQmlLoad(qmlComponent, targetContext, f);
         });
-        return nullptr;
+        return;
     }
 
-    return finishQmlLoad(qmlComponent, targetContext, f);
+    finishQmlLoad(qmlComponent, targetContext, f);
 }
 
-QObject* OffscreenQmlSurface::loadInNewContext(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f) {
-    return load(qmlSource, true, f);
+void OffscreenQmlSurface::loadInNewContext(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f) {
+    load(qmlSource, true, f);
 }
 
-QObject* OffscreenQmlSurface::load(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f) {
-    return load(qmlSource, false, f);
+void OffscreenQmlSurface::load(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f) {
+    load(qmlSource, false, f);
 }
 
 void OffscreenQmlSurface::clearCache() {
     _qmlContext->engine()->clearComponentCache();
 }
 
-QObject* OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, std::function<void(QQmlContext*, QObject*)> f) {
+void OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, std::function<void(QQmlContext*, QObject*)> f) {
     disconnect(qmlComponent, &QQmlComponent::statusChanged, this, 0);
     if (qmlComponent->isError()) {
         for (const auto& error : qmlComponent->errors()) {
             qCWarning(uiLogging) << error.url() << error.line() << error;
         }
         qmlComponent->deleteLater();
-        return nullptr;
+        return;
     }
 
 
@@ -700,7 +700,7 @@ QObject* OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlCon
             qFatal("Unable to finish loading QML root");
         }
         qmlComponent->deleteLater();
-        return nullptr;
+        return;
     }
 
     qmlContext->engine()->setObjectOwnership(this, QQmlEngine::CppOwnership);
@@ -726,19 +726,19 @@ QObject* OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlCon
     }
 
     // If we already have a root, just set a couple of flags and the ancestry
-    if (_rootItem) {
+    if (newItem && _rootItem) {
         // Allow child windows to be destroyed from JS
         QQmlEngine::setObjectOwnership(newObject, QQmlEngine::JavaScriptOwnership);
         newObject->setParent(_rootItem);
         if (newItem) {
             newItem->setParentItem(_rootItem);
         }
-        return newObject;
+        return;
     }
 
     if (!newItem) {
         qFatal("Could not load object as root item");
-        return nullptr;
+        return;
     }
 
     connect(newItem, SIGNAL(sendToScript(QVariant)), this, SIGNAL(fromQml(QVariant)));
@@ -747,7 +747,6 @@ QObject* OffscreenQmlSurface::finishQmlLoad(QQmlComponent* qmlComponent, QQmlCon
     _rootItem = newItem;
     _rootItem->setParentItem(_quickWindow->contentItem());
     _rootItem->setSize(_quickWindow->renderTargetSize());
-    return _rootItem;
 }
 
 void OffscreenQmlSurface::updateQuick() {
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.h b/libraries/ui/src/ui/OffscreenQmlSurface.h
index 3b53f6a185..7da929723c 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.h
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.h
@@ -50,10 +50,10 @@ public:
     void resize(const QSize& size, bool forceResize = false);
     QSize size() const;
 
-    Q_INVOKABLE QObject* load(const QUrl& qmlSource, bool createNewContext, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
-    Q_INVOKABLE QObject* loadInNewContext(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
-    Q_INVOKABLE QObject* load(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
-    Q_INVOKABLE QObject* load(const QString& qmlSourceFile, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {}) {
+    Q_INVOKABLE void load(const QUrl& qmlSource, bool createNewContext, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
+    Q_INVOKABLE void loadInNewContext(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
+    Q_INVOKABLE void load(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {});
+    Q_INVOKABLE void load(const QString& qmlSourceFile, std::function<void(QQmlContext*, QObject*)> f = [](QQmlContext*, QObject*) {}) {
         return load(QUrl(qmlSourceFile), f);
     }
     void clearCache();
@@ -120,7 +120,7 @@ protected:
 private:
     static QOpenGLContext* getSharedContext();
 
-    QObject* finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, std::function<void(QQmlContext*, QObject*)> f);
+    void finishQmlLoad(QQmlComponent* qmlComponent, QQmlContext* qmlContext, std::function<void(QQmlContext*, QObject*)> f);
     QPointF mapWindowToUi(const QPointF& sourcePosition, QObject* sourceObject);
     void setupFbo();
     bool allowNewFrame(uint8_t fps);

From 84f37b9663041a1e3b717c1c160fa07790ff4b56 Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Thu, 7 Sep 2017 18:53:05 +0100
Subject: [PATCH 74/78] Changed string name

---
 cmake/templates/NSIS.template.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 668270b9d3..e76a2d51fd 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -964,13 +964,13 @@ SectionEnd
 
       ; the process is running, ask the user to close it
       
-      ${If} "${displayName}" == "Sandbox"
+      ${If} "${displayName}" == "@CONSOLE_DISPLAY_NAME@"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0
       ${EndIf}
 
-      ${If} "${displayName}" == "Interface"
+      ${If} "${displayName}" == "@INTERFACE_DISPLAY_NAME@"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the task bar and click Retry to continue." \
         /SD IDCANCEL IDRETRY Prompt_${UniqueID} IDCANCEL 0

From 05f039a251b45ea9668553fd4937c31cc86a2c68 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 7 Sep 2017 17:50:55 -0700
Subject: [PATCH 75/78] Almost there

---
 .../lib/styles-uit/HifiConstants.qmlc         | Bin 51304 -> 51304 bytes
 .../utilities/render/antialiasing.qml         |  46 ++++++++----------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/scripts/developer/utilities/lib/styles-uit/HifiConstants.qmlc b/scripts/developer/utilities/lib/styles-uit/HifiConstants.qmlc
index 369d4444878f60a092189d56d24fd586c7a0c747..a11d8cf029dcb2a16ad80b66aa3ac76475f0233e 100644
GIT binary patch
delta 104
zcmaDcf%(M*W}U(^ljM}dl0-oU1_nk>R))Potmk4G85nG;85nAuW^T0qCvEb_ZFTsZ
z_rd2k>inow4Q60qNMp!k$YDrjuwu{$!(=eaogtH<gdu~Wlp$%dZ&f=Z!{&=s(|rMl
CYaX`%

delta 106
zcmaDcf%(M*W}U(^ljM}dl0-oU1_nk>R)%vaax!s@3=B5a3=DU@Bo!xd$^}mDUF9x#
zN&L=6ogbB&p$rTRX$+YRISi=`Rt)-Jm<(olFl2&df*4X63K;Sydsek?zEU;C7XT#3
B9RmOW

diff --git a/scripts/developer/utilities/render/antialiasing.qml b/scripts/developer/utilities/render/antialiasing.qml
index 1a81db9904..c194b0ace4 100644
--- a/scripts/developer/utilities/render/antialiasing.qml
+++ b/scripts/developer/utilities/render/antialiasing.qml
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.5
+import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
@@ -28,6 +28,7 @@ Rectangle {
     Column {
         id: antialiasing
         spacing: 20
+        padding: 10
 
         Column{
                 spacing: 10
@@ -125,16 +126,17 @@ Rectangle {
                             checked: Render.getConfig("RenderMainView.Antialiasing")["clipExactColor"]
                             onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["clipExactColor"] = checked }
                         }
-                        HifiControls.ConfigSlider {
-                            label: qsTr("Covariance gamma")
-                            integral: false
-                            config: Render.getConfig("RenderMainView.Antialiasing")
-                            property: "covarianceGamma"
-                            max: 1.5
-                            min: 0.5
-                        }
                     }
-                }                            
+                }  
+                HifiControls.ConfigSlider {
+                    label: qsTr("Covariance gamma")
+                    integral: false
+                    config: Render.getConfig("RenderMainView.Antialiasing")
+                    property: "covarianceGamma"
+                    max: 1.5
+                    min: 0.5
+                }                          
+                Separator {}          
                 HifiControls.CheckBox {
                     boxSize: 20
                     text: "Feedback history color"
@@ -152,6 +154,7 @@ Rectangle {
                 }
 
             }
+            Separator {}                      
             Row {
 
                 spacing: 10
@@ -176,23 +179,12 @@ Rectangle {
                 max: 1.0
                 min: 0.0
             }
-            HifiControls.ConfigSlider {
-                label: qsTr("FXAA Region >")
-                integral: false
-                config: Render.getConfig("RenderMainView.Antialiasing")
-                property: "debugFXAAX"
-                max: 1.0
-                min: 0.0
-            }
-            Row {
-
-                HifiControls.CheckBox {
-                    boxSize: 20
-                    text: "Closest Fragment"
-                    checked: Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"]
-                    onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"] = checked }
-                }                
-            }            
+            HifiControls.CheckBox {
+                boxSize: 20
+                text: "Closest Fragment"
+                checked: Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"]
+                onCheckedChanged: { Render.getConfig("RenderMainView.Antialiasing")["showClosestFragment"] = checked }
+            }           
             HifiControls.ConfigSlider {
                 label: qsTr("Debug Velocity Threshold [pix]")
                 integral: false

From efdc340c5c0452e9116f662888a74515852fa922 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Thu, 7 Sep 2017 18:15:04 -0700
Subject: [PATCH 76/78] Use new hfc account endpoint

---
 .../qml/hifi/commerce/wallet/Wallet.qml       |  9 ++++++-
 interface/src/commerce/Ledger.cpp             | 25 +++++++++++++++++++
 interface/src/commerce/Ledger.h               |  4 +++
 interface/src/commerce/QmlCommerce.cpp        |  6 +++++
 interface/src/commerce/QmlCommerce.h          |  2 ++
 interface/src/commerce/Wallet.cpp             |  8 +++---
 interface/src/commerce/Wallet.h               |  6 +++++
 7 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 401ef89374..1efed8b941 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -33,12 +33,19 @@ Rectangle {
     Hifi.QmlCommerce {
         id: commerce;
 
+        onAccountResult: {
+            if(result.status === "success") {
+                commerce.getKeyFilePathIfExists();
+            } else {
+                // unsure how to handle a failure here. We definitely cannot proceed.
+            }
+        }
         onLoginStatusResult: {
             if (!isLoggedIn && root.activeView !== "needsLogIn") {
                 root.activeView = "needsLogIn";
             } else if (isLoggedIn) {
                 root.activeView = "initialize";
-                commerce.getKeyFilePathIfExists();
+                commerce.account();
             }
         }
 
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 2055229059..a1488af1fe 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -176,3 +176,28 @@ void Ledger::resetFailure(QNetworkReply& reply) { failResponse("reset", reply);
 void Ledger::reset() {
     send("reset_user_hfc_account", "resetSuccess", "resetFailure", QNetworkAccessManager::PutOperation, QJsonObject());
 }
+
+void Ledger::accountSuccess(QNetworkReply& reply) {
+    // lets set the appropriate stuff in the wallet now
+    auto wallet = DependencyManager::get<Wallet>();
+    QByteArray response = reply.readAll();
+    QJsonObject data = QJsonDocument::fromJson(response).object()["data"].toObject();
+
+    auto salt = QByteArray::fromBase64(data["salt"].toString().toUtf8());
+    auto iv = QByteArray::fromBase64(data["iv"].toString().toUtf8());
+    auto ckey = QByteArray::fromBase64(data["ckey"].toString().toUtf8());
+
+    wallet->setSalt(salt);
+    wallet->setIv(iv);
+    wallet->setCKey(ckey);
+
+    // none of the hfc account info should be emitted
+    emit accountResult(QJsonObject{ {"status", "success"} });
+}
+
+void Ledger::accountFailure(QNetworkReply& reply) {
+    failResponse("account", reply);
+}
+void Ledger::account() {
+    send("hfc_account", "accountSuccess", "accountFailure", QNetworkAccessManager::PutOperation, QJsonObject());
+}
diff --git a/interface/src/commerce/Ledger.h b/interface/src/commerce/Ledger.h
index 55b648aa4c..6aadf5afb0 100644
--- a/interface/src/commerce/Ledger.h
+++ b/interface/src/commerce/Ledger.h
@@ -29,6 +29,7 @@ public:
     void balance(const QStringList& keys);
     void inventory(const QStringList& keys);
     void history(const QStringList& keys);
+    void account();
     void reset();
 
 signals:
@@ -37,6 +38,7 @@ signals:
     void balanceResult(QJsonObject result);
     void inventoryResult(QJsonObject result);
     void historyResult(QJsonObject result);
+    void accountResult(QJsonObject result);
 
 public slots:
     void buySuccess(QNetworkReply& reply);
@@ -51,6 +53,8 @@ public slots:
     void historyFailure(QNetworkReply& reply);
     void resetSuccess(QNetworkReply& reply);
     void resetFailure(QNetworkReply& reply);
+    void accountSuccess(QNetworkReply& reply);
+    void accountFailure(QNetworkReply& reply);
 
 private:
     QJsonObject apiResponse(const QString& label, QNetworkReply& reply);
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 8681fcba50..9315a2e9c5 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -27,6 +27,7 @@ QmlCommerce::QmlCommerce(QQuickItem* parent) : OffscreenQmlDialog(parent) {
     connect(wallet.data(), &Wallet::securityImageResult, this, &QmlCommerce::securityImageResult);
     connect(ledger.data(), &Ledger::historyResult, this, &QmlCommerce::historyResult);
     connect(wallet.data(), &Wallet::keyFilePathIfExistsResult, this, &QmlCommerce::keyFilePathIfExistsResult);
+    connect(ledger.data(), &Ledger::accountResult, this, &QmlCommerce::accountResult);
 }
 
 void QmlCommerce::getLoginStatus() {
@@ -106,3 +107,8 @@ void QmlCommerce::reset() {
     ledger->reset();
     wallet->reset();
 }
+
+void QmlCommerce::account() {
+    auto ledger = DependencyManager::get<Ledger>();
+    ledger->account();
+}
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index 7d9317efae..7b0bab95a6 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -39,6 +39,7 @@ signals:
     void balanceResult(QJsonObject result);
     void inventoryResult(QJsonObject result);
     void historyResult(QJsonObject result);
+    void accountResult(QJsonObject result);
 
 protected:
     Q_INVOKABLE void getLoginStatus();
@@ -55,6 +56,7 @@ protected:
     Q_INVOKABLE void history();
     Q_INVOKABLE void generateKeyPair();
     Q_INVOKABLE void reset();
+    Q_INVOKABLE void account();
 };
 
 #endif // hifi_QmlCommerce_h
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 8bdb8305d5..6bd010730f 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -257,10 +257,10 @@ RSA* readPrivateKey(const char* filename) {
 static const unsigned char IVEC[16] = "IAmAnIVecYay123";
 
 void initializeAESKeys(unsigned char* ivec, unsigned char* ckey, const QByteArray& salt) {
-    // first ivec
-    memcpy(ivec, IVEC, 16);
-    auto hash = QCryptographicHash::hash(salt, QCryptographicHash::Sha256);
-    memcpy(ckey, hash.data(), 32);
+    // use the ones in the wallet
+    auto wallet = DependencyManager::get<Wallet>();
+    memcpy(ivec, wallet->getIv(), 16);
+    memcpy(ckey, wallet->getCKey(), 32);
 }
 
 Wallet::~Wallet() {
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
index f72b7adc41..f3c2ac399b 100644
--- a/interface/src/commerce/Wallet.h
+++ b/interface/src/commerce/Wallet.h
@@ -35,6 +35,10 @@ public:
 
     void setSalt(const QByteArray& salt) { _salt = salt; }
     QByteArray getSalt() { return _salt; }
+    void setIv(const QByteArray& iv) { _iv = iv; }
+    QByteArray getIv() { return _iv; }
+    void setCKey(const QByteArray& ckey) { _ckey = ckey; }
+    QByteArray getCKey() { return _ckey; }
 
     void setPassphrase(const QString& passphrase);
     QString* getPassphrase() { return _passphrase; }
@@ -52,6 +56,8 @@ private:
     QStringList _publicKeys{};
     QPixmap* _securityImage { nullptr };
     QByteArray _salt {"iamsalt!"};
+    QByteArray _iv;
+    QByteArray _ckey;
     QString* _passphrase { new QString("") };
 
     void updateImageProvider();

From bb07a586ca7181f6aed6289aa75cd02208068482 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Thu, 7 Sep 2017 19:24:31 -0700
Subject: [PATCH 77/78] warning, plus salting passphrase now

---
 interface/src/commerce/Wallet.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 6bd010730f..2faa08064d 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -55,9 +55,12 @@ QString imageFilePath() {
 // use the cached _passphrase if it exists, otherwise we need to prompt
 int passwordCallback(char* password, int maxPasswordSize, int rwFlag, void* u) {
     // just return a hardcoded pwd for now
-    auto passphrase = DependencyManager::get<Wallet>()->getPassphrase();
+    auto wallet = DependencyManager::get<Wallet>();
+    auto passphrase = wallet->getPassphrase();
     if (passphrase && !passphrase->isEmpty()) {
-        strcpy(password, passphrase->toLocal8Bit().constData());
+        QString saltedPassphrase(*passphrase);
+        saltedPassphrase.append(wallet->getSalt());
+        strcpy(password, saltedPassphrase.toUtf8().constData());
         return static_cast<int>(passphrase->size());
     } else {
         // this shouldn't happen - so lets log it to tell us we have
@@ -254,7 +257,6 @@ RSA* readPrivateKey(const char* filename) {
     }
     return key;
 }
-static const unsigned char IVEC[16] = "IAmAnIVecYay123";
 
 void initializeAESKeys(unsigned char* ivec, unsigned char* ckey, const QByteArray& salt) {
     // use the ones in the wallet

From 45c8dd9dd4374901a3b9d705024a96929e164c61 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Fri, 8 Sep 2017 05:28:41 -0700
Subject: [PATCH 78/78] cr feedback

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 1efed8b941..87cde5f43d 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -34,7 +34,7 @@ Rectangle {
         id: commerce;
 
         onAccountResult: {
-            if(result.status === "success") {
+            if (result.status === "success") {
                 commerce.getKeyFilePathIfExists();
             } else {
                 // unsure how to handle a failure here. We definitely cannot proceed.