From d056c41e251d6586f0f0d54e013d487daee2a025 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 4 Mar 2016 13:55:24 -0800
Subject: [PATCH 01/35] Update to latest Oculus SDK, add input device support

---
 cmake/externals/LibOVR/CMakeLists.txt         |  23 +-
 .../src/controllers/StandardControls.h        |   3 +
 .../oculus/src/OculusBaseDisplayPlugin.cpp    |  20 +-
 plugins/oculus/src/OculusBaseDisplayPlugin.h  |   1 -
 .../oculus/src/OculusControllerManager.cpp    | 218 ++++++++++++++++++
 plugins/oculus/src/OculusControllerManager.h  |  82 +++++++
 plugins/oculus/src/OculusDisplayPlugin.cpp    |   2 +-
 plugins/oculus/src/OculusHelpers.cpp          |  39 +++-
 plugins/oculus/src/OculusHelpers.h            |   4 +-
 plugins/oculus/src/OculusProvider.cpp         |   4 +-
 10 files changed, 354 insertions(+), 42 deletions(-)
 create mode 100644 plugins/oculus/src/OculusControllerManager.cpp
 create mode 100644 plugins/oculus/src/OculusControllerManager.h

diff --git a/cmake/externals/LibOVR/CMakeLists.txt b/cmake/externals/LibOVR/CMakeLists.txt
index a98745b404..5b8a689a9a 100644
--- a/cmake/externals/LibOVR/CMakeLists.txt
+++ b/cmake/externals/LibOVR/CMakeLists.txt
@@ -12,19 +12,16 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 # 0.5 public
 #    URL http://static.oculus.com/sdk-downloads/ovr_sdk_win_0.5.0.1.zip
 #    URL_MD5 d3fc4c02db9be5ff08af4ef4c97b32f9
-# 0.6 public
-#    URL http://static.oculus.com/sdk-downloads/0.6.0.1/Public/1435190862/ovr_sdk_win_0.6.0.1.zip
-#    URL_MD5 4b3ef825f9a1d6d3035c9f6820687da9
-# 0.8 public
-#    URL http://static.oculus.com/sdk-downloads/0.8.0.0/Public/1445451746/ovr_sdk_win_0.8.0.0.zip
-#    URL_MD5 54944b03b95149d6010f84eb701b9647
+# 1.3 public 
+#    URL http://hifi-public.s3.amazonaws.com/dependencies/ovr_sdk_win_1.3.0_public.zip
+#    URL_MD5 4d26faba0c1f35ff80bf674c96ed9259
 
 if (WIN32)
 
   ExternalProject_Add(
     ${EXTERNAL_NAME}
-    URL http://static.oculus.com/sdk-downloads/0.8.0.0/Public/1445451746/ovr_sdk_win_0.8.0.0.zip
-    URL_MD5 54944b03b95149d6010f84eb701b9647
+    URL http://hifi-public.s3.amazonaws.com/dependencies/ovr_sdk_win_1.3.0_public.zip
+    URL_MD5 a2dcf695e0f03a70fdd1ed7480585e82
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
@@ -33,14 +30,16 @@ if (WIN32)
 
   ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
 
-  # FIXME need to account for different architectures 
-  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/LibOVR/Include CACHE TYPE INTERNAL)
+  set(LIBOVR_DIR ${SOURCE_DIR}/OculusSDK/LibOVR)
   if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/LibOVR/Lib/Windows/x64/Release/VS2013/LibOVR.lib CACHE TYPE INTERNAL)
+    set(LIBOVR_LIB_DIR ${LIBOVR_DIR}/Lib/Windows/x64/Release/VS2013 CACHE TYPE INTERNAL)
   else()
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/LibOVR/Lib/Windows/Win32/Release/VS2013/LibOVR.lib CACHE TYPE INTERNAL)
+    set(LIBOVR_LIB_DIR ${LIBOVR_DIR}/Lib/Windows/Win32/Release/VS2013 CACHE TYPE INTERNAL)
   endif()
 
+  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${LIBOVR_DIR}/Include CACHE TYPE INTERNAL)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${LIBOVR_LIB_DIR}/LibOVR.lib CACHE TYPE INTERNAL)
+  
 elseif(APPLE)
   
   ExternalProject_Add(
diff --git a/libraries/controllers/src/controllers/StandardControls.h b/libraries/controllers/src/controllers/StandardControls.h
index 2b0613321e..f101ba6c51 100644
--- a/libraries/controllers/src/controllers/StandardControls.h
+++ b/libraries/controllers/src/controllers/StandardControls.h
@@ -81,6 +81,9 @@ namespace controller {
         // Triggers
         LT,
         RT,
+        // Grips (Oculus touch squeeze)
+        LG,
+        RG,
         NUM_STANDARD_AXES,
         LZ = LT,
         RZ = RT
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
index e23d8cade6..8f4e8d665d 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
@@ -12,7 +12,7 @@
 #include "OculusHelpers.h"
 
 void OculusBaseDisplayPlugin::resetSensors() {
-    ovr_RecenterPose(_session);
+    ovr_RecenterTrackingOrigin(_session);
 }
 
 void OculusBaseDisplayPlugin::updateHeadPose(uint32_t frameIndex) {
@@ -42,36 +42,30 @@ bool OculusBaseDisplayPlugin::internalActivate() {
 
     _hmdDesc = ovr_GetHmdDesc(_session);
 
-    _ipd = ovr_GetFloat(_session, OVR_KEY_IPD, _ipd);
-
     glm::uvec2 eyeSizes[2];
     _viewScaleDesc.HmdSpaceToWorldScaleInMeters = 1.0f;
 
+    _ipd = 0;
     ovr_for_each_eye([&](ovrEyeType eye) {
         _eyeFovs[eye] = _hmdDesc.DefaultEyeFov[eye];
         ovrEyeRenderDesc& erd = _eyeRenderDescs[eye] = ovr_GetRenderDesc(_session, eye, _eyeFovs[eye]);
         ovrMatrix4f ovrPerspectiveProjection =
-            ovrMatrix4f_Projection(erd.Fov, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, ovrProjection_RightHanded);
+            ovrMatrix4f_Projection(erd.Fov, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, ovrProjection_ClipRangeOpenGL);
         _eyeProjections[eye] = toGlm(ovrPerspectiveProjection);
-        _eyeOffsets[eye] = glm::translate(mat4(), toGlm(erd.HmdToEyeViewOffset));
+        _eyeOffsets[eye] = glm::translate(mat4(), toGlm(erd.HmdToEyeOffset));
         eyeSizes[eye] = toGlm(ovr_GetFovTextureSize(_session, eye, erd.Fov, 1.0f));
-        _viewScaleDesc.HmdToEyeViewOffset[eye] = erd.HmdToEyeViewOffset;
+        _viewScaleDesc.HmdToEyeOffset[eye] = erd.HmdToEyeOffset;
+        _ipd += glm::abs(glm::length(toGlm(erd.HmdToEyeOffset)));
     });
 
     auto combinedFov = _eyeFovs[0];
     combinedFov.LeftTan = combinedFov.RightTan = std::max(combinedFov.LeftTan, combinedFov.RightTan);
-    _cullingProjection = toGlm(ovrMatrix4f_Projection(combinedFov, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, ovrProjection_RightHanded));
+    _cullingProjection = toGlm(ovrMatrix4f_Projection(combinedFov, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, ovrProjection_ClipRangeOpenGL));
 
     _renderTargetSize = uvec2(
         eyeSizes[0].x + eyeSizes[1].x,
         std::max(eyeSizes[0].y, eyeSizes[1].y));
 
-    if (!OVR_SUCCESS(ovr_ConfigureTracking(_session,
-        ovrTrackingCap_Orientation | ovrTrackingCap_Position | ovrTrackingCap_MagYawCorrection, 0))) {
-        logWarning("Failed to attach to sensor device");
-    }
-
-    // Parent class relies on our _session intialization, so it must come after that.
     memset(&_sceneLayer, 0, sizeof(ovrLayerEyeFov));
     _sceneLayer.Header.Type = ovrLayerType_EyeFov;
     _sceneLayer.Header.Flags = ovrLayerFlag_TextureOriginAtBottomLeft;
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h
index d21b0561bc..b5ec0769e0 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.h
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h
@@ -30,7 +30,6 @@ protected:
 protected:
     ovrSession _session;
     ovrGraphicsLuid _luid;
-    float _ipd{ OVR_DEFAULT_IPD };
     ovrEyeRenderDesc _eyeRenderDescs[2];
     ovrFovPort _eyeFovs[2];
     ovrHmdDesc _hmdDesc;
diff --git a/plugins/oculus/src/OculusControllerManager.cpp b/plugins/oculus/src/OculusControllerManager.cpp
new file mode 100644
index 0000000000..0761dc1655
--- /dev/null
+++ b/plugins/oculus/src/OculusControllerManager.cpp
@@ -0,0 +1,218 @@
+//
+//  OculusControllerManager.cpp
+//  input-plugins/src/input-plugins
+//
+//  Created by Bradley Austin Davis 2016/03/04.
+//  Copyright 2013-2016 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 "OculusControllerManager.h"
+
+#include <QtCore/QLoggingCategory>
+
+#include <plugins/PluginContainer.h>
+#include <controllers/UserInputMapper.h>
+#include <controllers/StandardControls.h>
+
+#include <PerfStat.h>
+#include <PathUtils.h>
+
+#include "OculusHelpers.h"
+
+Q_DECLARE_LOGGING_CATEGORY(oculus)
+
+
+static const QString MENU_PARENT = "Avatar";
+static const QString MENU_NAME = "Oculus Touch Controllers";
+static const QString MENU_PATH = MENU_PARENT + ">" + MENU_NAME;
+
+const QString OculusControllerManager::NAME = "Oculus";
+
+bool OculusControllerManager::isSupported() const {
+    return oculusAvailable();
+}
+
+void OculusControllerManager::activate() {
+    InputPlugin::activate();
+    if (!_session) {
+        _session = acquireOculusSession();
+    }
+    Q_ASSERT(_session);
+
+    // register with UserInputMapper
+    auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+    if (_remote) {
+        userInputMapper->registerDevice(_remote);
+    }
+    if (_touch) {
+        userInputMapper->registerDevice(_touch);
+    }
+}
+
+void OculusControllerManager::deactivate() {
+    InputPlugin::deactivate();
+
+    if (_session) {
+        releaseOculusSession();
+        _session = nullptr;
+    }
+
+    // unregister with UserInputMapper
+    auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+    if (_touch) {
+        userInputMapper->removeDevice(_touch->getDeviceID());
+    }
+    if (_remote) {
+        userInputMapper->removeDevice(_remote->getDeviceID());
+    }
+}
+
+void OculusControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) {
+    PerformanceTimer perfTimer("OculusControllerManager::TouchDevice::update");
+
+    if (!OVR_SUCCESS(ovr_GetInputState(_session, ovrControllerType_Touch, &_inputState))) {
+        qCWarning(oculus) << "Unable to read oculus input state";
+        return;
+    }
+
+    if (_touch) {
+        _touch->update(deltaTime, inputCalibrationData, jointsCaptured);
+    }
+    if (_remote) {
+        _remote->update(deltaTime, inputCalibrationData, jointsCaptured);
+    }
+}
+
+void OculusControllerManager::pluginFocusOutEvent() {
+    if (_touch) {
+        _touch->focusOutEvent();
+    }
+    if (_remote) {
+        _remote->focusOutEvent();
+    }
+}
+
+using namespace controller;
+
+static const std::vector<std::pair<ovrButton, StandardButtonChannel>> BUTTON_MAP { {
+    { ovrButton_X, X },
+    { ovrButton_Y, Y },
+    { ovrButton_A, A },
+    { ovrButton_B, B },
+    { ovrButton_LThumb, LS },
+    { ovrButton_RThumb, RS },
+    { ovrButton_LShoulder, LB },
+    { ovrButton_RShoulder, RB },
+} };
+
+static const std::vector<std::pair<ovrTouch, StandardButtonChannel>> TOUCH_MAP { {
+    { ovrTouch_X, LEFT_SECONDARY_THUMB_TOUCH },
+    { ovrTouch_Y, LEFT_SECONDARY_THUMB_TOUCH },
+    { ovrTouch_A, RIGHT_SECONDARY_THUMB_TOUCH },
+    { ovrTouch_B, RIGHT_SECONDARY_THUMB_TOUCH },
+    { ovrTouch_LIndexTrigger, LEFT_PRIMARY_INDEX_TOUCH },
+    { ovrTouch_RIndexTrigger, RIGHT_PRIMARY_INDEX_TOUCH },
+    { ovrTouch_LThumb, LS_TOUCH },
+    { ovrTouch_RThumb, RS_TOUCH },
+    { ovrTouch_LThumbUp, LEFT_THUMB_UP },
+    { ovrTouch_RThumbUp, RIGHT_THUMB_UP },
+    { ovrTouch_LIndexPointing, LEFT_INDEX_POINT },
+    { ovrTouch_RIndexPointing, RIGHT_INDEX_POINT },
+} };
+
+void OculusControllerManager::TouchDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) {
+    _poseStateMap.clear();
+    _buttonPressedMap.clear();
+
+    if (!jointsCaptured) {
+        int numTrackedControllers = 0;
+        static const auto REQUIRED_HAND_STATUS = ovrStatus_OrientationTracked & ovrStatus_PositionTracked;
+        auto tracking = ovr_GetTrackingState(_parent._session, 0, false);
+        ovr_for_each_hand([&](ovrHandType hand) {
+            ++numTrackedControllers;
+            if (REQUIRED_HAND_STATUS == (tracking.HandStatusFlags[hand] & REQUIRED_HAND_STATUS)) {
+                handlePose(deltaTime, inputCalibrationData, hand, tracking.HandPoses[hand]);
+            }
+        });
+    }
+    using namespace controller;
+    // Axes
+    const auto& inputState = _parent._inputState;
+    _axisStateMap[LX] = inputState.Thumbstick[ovrHand_Left].x;
+    _axisStateMap[LY] = inputState.Thumbstick[ovrHand_Left].y;
+    _axisStateMap[LT] = inputState.IndexTrigger[ovrHand_Left];
+    _axisStateMap[LG] = inputState.HandTrigger[ovrHand_Left];
+
+    _axisStateMap[RX] = inputState.Thumbstick[ovrHand_Right].x;
+    _axisStateMap[RY] = inputState.Thumbstick[ovrHand_Right].y;
+    _axisStateMap[RT] = inputState.IndexTrigger[ovrHand_Right];
+    _axisStateMap[RG] = inputState.HandTrigger[ovrHand_Right];
+
+    // Buttons
+    for (const auto& pair : BUTTON_MAP) {
+        if (inputState.Buttons & pair.first) {
+            _buttonPressedMap.insert(pair.second);
+        }
+    }
+    // Touches
+    for (const auto& pair : TOUCH_MAP) {
+        if (inputState.Touches & pair.first) {
+            _buttonPressedMap.insert(pair.second);
+        }
+    }
+}
+
+void OculusControllerManager::TouchDevice::focusOutEvent() {
+    _axisStateMap.clear();
+    _buttonPressedMap.clear();
+};
+
+void OculusControllerManager::TouchDevice::handlePose(float deltaTime, 
+    const controller::InputCalibrationData& inputCalibrationData, ovrHandType hand, 
+    const ovrPoseStatef& handPose) {
+    auto poseId = hand == ovrHand_Left ? controller::LEFT_HAND : controller::RIGHT_HAND;
+    auto& pose = _poseStateMap[poseId];
+    pose.translation = toGlm(handPose.ThePose.Position);
+    pose.rotation = toGlm(handPose.ThePose.Orientation);
+    pose.angularVelocity = toGlm(handPose.AngularVelocity);
+    pose.velocity = toGlm(handPose.LinearVelocity);
+}
+
+controller::Input::NamedVector OculusControllerManager::TouchDevice::getAvailableInputs() const {
+    using namespace controller;
+    QVector<Input::NamedPair> availableInputs{
+        // Trackpad analogs
+        makePair(LX, "LX"),
+        makePair(LY, "LY"),
+        makePair(RX, "RX"),
+        makePair(RY, "RY"),
+        // trigger analogs
+        makePair(LT, "LT"),
+        makePair(RT, "RT"),
+
+        makePair(LB, "LB"),
+        makePair(RB, "RB"),
+
+        makePair(LS, "LS"),
+        makePair(RS, "RS"),
+        makePair(LEFT_HAND, "LeftHand"),
+        makePair(RIGHT_HAND, "RightHand"),
+
+        makePair(LEFT_PRIMARY_THUMB, "LeftPrimaryThumb"),
+        makePair(LEFT_SECONDARY_THUMB, "LeftSecondaryThumb"),
+        makePair(RIGHT_PRIMARY_THUMB, "RightPrimaryThumb"),
+        makePair(RIGHT_SECONDARY_THUMB, "RightSecondaryThumb"),
+    };
+    return availableInputs;
+}
+
+QString OculusControllerManager::TouchDevice::getDefaultMappingConfig() const {
+    static const QString MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/touch.json";
+    return MAPPING_JSON;
+}
+
+
+
diff --git a/plugins/oculus/src/OculusControllerManager.h b/plugins/oculus/src/OculusControllerManager.h
new file mode 100644
index 0000000000..7a30b19aa4
--- /dev/null
+++ b/plugins/oculus/src/OculusControllerManager.h
@@ -0,0 +1,82 @@
+//
+//  Created by Bradley Austin Davis on 2016/03/04
+//  Copyright 2013-2016 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
+//
+
+#ifndef hifi__OculusControllerManager
+#define hifi__OculusControllerManager
+
+#include <QObject>
+#include <unordered_set>
+
+#include <GLMHelpers.h>
+
+#include <controllers/InputDevice.h>
+#include <plugins/InputPlugin.h>
+
+#include <OVR_CAPI.h>
+
+class OculusControllerManager : public InputPlugin {
+    Q_OBJECT
+public:
+    // Plugin functions
+    bool isSupported() const override;
+    bool isJointController() const override { return true; }
+    const QString& getName() const override { return NAME; }
+
+    void activate() override;
+    void deactivate() override;
+
+    void pluginFocusOutEvent() override;
+    void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) override;
+
+private:
+    class OculusInputDevice : public controller::InputDevice {
+    public:
+        OculusInputDevice(OculusControllerManager& parent, const QString& name) : controller::InputDevice(name), _parent(parent) {}
+
+        OculusControllerManager& _parent;
+        friend class OculusControllerManager;
+    };
+
+    // Waiting on touch API
+    class RemoteDevice : public OculusInputDevice {
+    public:
+        using Pointer = std::shared_ptr<RemoteDevice>;
+        RemoteDevice(OculusControllerManager& parent) : OculusInputDevice(parent, "Oculus Remote") {}
+
+        controller::Input::NamedVector getAvailableInputs() const override;
+        QString getDefaultMappingConfig() const override;
+        void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) override;
+        void focusOutEvent() override;
+
+        friend class OculusControllerManager;
+    };
+
+    class TouchDevice : public OculusInputDevice {
+    public:
+        using Pointer = std::shared_ptr<TouchDevice>;
+        TouchDevice(OculusControllerManager& parent) : OculusInputDevice(parent, "Oculus Touch") {}
+
+        controller::Input::NamedVector getAvailableInputs() const override;
+        QString getDefaultMappingConfig() const override;
+        void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) override;
+        void focusOutEvent() override;
+
+    private:
+        void handlePose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, ovrHandType hand, const ovrPoseStatef& handPose);
+        int _trackedControllers { 0 };
+        friend class OculusControllerManager;
+    };
+
+    ovrSession _session { nullptr };
+    ovrInputState _inputState {};
+    RemoteDevice::Pointer _remote;
+    TouchDevice::Pointer _touch;
+    static const QString NAME;
+};
+
+#endif // hifi__OculusControllerManager
diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp
index 8c3a676c61..1a5a32ffb2 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusDisplayPlugin.cpp
@@ -70,5 +70,5 @@ void OculusDisplayPlugin::hmdPresent() {
             logWarning("Failed to present");
         }
     }
-    _sceneFbo->Increment();
+    _sceneFbo->Commit();
 }
diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index 170be05952..d38303919e 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -98,9 +98,8 @@ SwapFramebufferWrapper::~SwapFramebufferWrapper() {
     destroyColor();
 }
 
-void SwapFramebufferWrapper::Increment() {
-    ++color->CurrentIndex;
-    color->CurrentIndex %= color->TextureCount;
+void SwapFramebufferWrapper::Commit() {
+    ovr_CommitTextureSwapChain(_session, color);
 }
 
 void SwapFramebufferWrapper::Resize(const uvec2 & size) {
@@ -114,7 +113,7 @@ void SwapFramebufferWrapper::Resize(const uvec2 & size) {
 
 void SwapFramebufferWrapper::destroyColor() {
     if (color) {
-        ovr_DestroySwapTextureSet(_session, color);
+        ovr_DestroyTextureSwapChain(_session, color);
         color = nullptr;
     }
 }
@@ -122,13 +121,30 @@ void SwapFramebufferWrapper::destroyColor() {
 void SwapFramebufferWrapper::initColor() {
     destroyColor();
 
-    if (!OVR_SUCCESS(ovr_CreateSwapTextureSetGL(_session, GL_SRGB8_ALPHA8, size.x, size.y, &color))) {
+    ovrTextureSwapChainDesc desc = {};
+    desc.Type = ovrTexture_2D;
+    desc.ArraySize = 1;
+    desc.Width = size.x;
+    desc.Height = size.y;
+    desc.MipLevels = 1;
+    desc.Format = OVR_FORMAT_R8G8B8A8_UNORM_SRGB;
+    desc.SampleCount = 1;
+    desc.StaticImage = ovrFalse;
+
+    ovrResult result = ovr_CreateTextureSwapChainGL(_session, &desc, &color);
+    if (!OVR_SUCCESS(result)) {
         logFatal("Failed to create swap textures");
     }
 
-    for (int i = 0; i < color->TextureCount; ++i) {
-        ovrGLTexture& ovrTex = (ovrGLTexture&)color->Textures[i];
-        glBindTexture(GL_TEXTURE_2D, ovrTex.OGL.TexId);
+    int length = 0;
+    result = ovr_GetTextureSwapChainLength(_session, color, &length);
+    if (!OVR_SUCCESS(result) || !length) {
+        qFatal("Unable to count swap chain textures");
+    }
+    for (int i = 0; i < length; ++i) {
+        GLuint chainTexId;
+        ovr_GetTextureSwapChainBufferGL(_session, color, i, &chainTexId);
+        glBindTexture(GL_TEXTURE_2D, chainTexId);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -141,8 +157,11 @@ void SwapFramebufferWrapper::initDone() {
 }
 
 void SwapFramebufferWrapper::onBind(oglplus::Framebuffer::Target target) {
-    ovrGLTexture& tex = (ovrGLTexture&)(color->Textures[color->CurrentIndex]);
-    glFramebufferTexture2D(toEnum(target), GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex.OGL.TexId, 0);
+    int curIndex;
+    ovr_GetTextureSwapChainCurrentIndex(_session, color, &curIndex);
+    GLuint curTexId;
+    ovr_GetTextureSwapChainBufferGL(_session, color, curIndex, &curTexId);
+    glFramebufferTexture2D(toEnum(target), GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, curTexId, 0);
 }
 
 void SwapFramebufferWrapper::onUnbind(oglplus::Framebuffer::Target target) {
diff --git a/plugins/oculus/src/OculusHelpers.h b/plugins/oculus/src/OculusHelpers.h
index e10e058ad2..2f13c45466 100644
--- a/plugins/oculus/src/OculusHelpers.h
+++ b/plugins/oculus/src/OculusHelpers.h
@@ -111,10 +111,10 @@ inline ovrPosef ovrPoseFromGlm(const glm::mat4 & m) {
 // then submit it and increment to the next texture.
 // The Oculus SDK manages the creation and destruction of
 // the textures
-struct SwapFramebufferWrapper : public FramebufferWrapper<ovrSwapTextureSet*, void*> {
+struct SwapFramebufferWrapper : public FramebufferWrapper<ovrTextureSwapChain, void*> {
     SwapFramebufferWrapper(const ovrSession& session);
     ~SwapFramebufferWrapper();
-    void Increment();
+    void Commit();
     void Resize(const uvec2 & size);
 protected:
     void initColor() override final;
diff --git a/plugins/oculus/src/OculusProvider.cpp b/plugins/oculus/src/OculusProvider.cpp
index be708db932..e723fa839a 100644
--- a/plugins/oculus/src/OculusProvider.cpp
+++ b/plugins/oculus/src/OculusProvider.cpp
@@ -18,6 +18,7 @@
 
 #include "OculusDisplayPlugin.h"
 #include "OculusDebugDisplayPlugin.h"
+#include "OculusControllerManager.h"
 
 class OculusProvider : public QObject, public DisplayProvider, InputProvider
 {
@@ -51,8 +52,6 @@ public:
     }
 
     virtual InputPluginList getInputPlugins() override {
-        // FIXME pending full oculus input API and hardware
-#if 0
         static std::once_flag once;
         std::call_once(once, [&] {
             InputPluginPointer plugin(new OculusControllerManager());
@@ -60,7 +59,6 @@ public:
                 _inputPlugins.push_back(plugin);
             }
         });
-#endif
         return _inputPlugins;
     }
 

From bd9813bbf59c48f69a8767d3ad0d72a1830bb1ae Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 28 Mar 2016 12:00:40 -0700
Subject: [PATCH 02/35] Only enable the Oculus plugin in the presence of the
 1.x runtime

---
 plugins/oculus/src/OculusBaseDisplayPlugin.h |  2 +-
 plugins/oculus/src/OculusControllerManager.h |  1 -
 plugins/oculus/src/OculusHelpers.cpp         | 16 +++++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h
index b5ec0769e0..41344335f3 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.h
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h
@@ -28,7 +28,7 @@ protected:
     void internalDeactivate() override;
 
 protected:
-    ovrSession _session;
+    ovrSession _session { nullptr };
     ovrGraphicsLuid _luid;
     ovrEyeRenderDesc _eyeRenderDescs[2];
     ovrFovPort _eyeFovs[2];
diff --git a/plugins/oculus/src/OculusControllerManager.h b/plugins/oculus/src/OculusControllerManager.h
index 7a30b19aa4..fb126ca2a8 100644
--- a/plugins/oculus/src/OculusControllerManager.h
+++ b/plugins/oculus/src/OculusControllerManager.h
@@ -42,7 +42,6 @@ private:
         friend class OculusControllerManager;
     };
 
-    // Waiting on touch API
     class RemoteDevice : public OculusInputDevice {
     public:
         using Pointer = std::shared_ptr<RemoteDevice>;
diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index d38303919e..fdd35a06fe 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -9,7 +9,9 @@
 #include "OculusHelpers.h"
 
 #include <atomic>
+
 #include <QtCore/QLoggingCategory>
+#include <QtCore/QFile>
 
 using Mutex = std::mutex;
 using Lock = std::unique_lock<Mutex>;
@@ -38,9 +40,21 @@ void logFatal(const char* what) {
     qFatal(error.c_str());
 }
 
+static const QString GOOD_OCULUS_RUNTIME_FILE { "C:\\Program Files(x86)\\Oculus\\Support\\oculus - runtime\\LibOVRRT64_1.dll" };
+
 bool oculusAvailable() {
     ovrDetectResult detect = ovr_Detect(0);
-    return (detect.IsOculusServiceRunning && detect.IsOculusHMDConnected);
+    if (!detect.IsOculusServiceRunning || !detect.IsOculusHMDConnected) {
+        return false;
+    }
+
+    // HACK Explicitly check for the presence of the 1.0 runtime DLL, and fail if it 
+    // doesn't exist
+    if (!QFile(GOOD_OCULUS_RUNTIME_FILE).exists()) {
+        return false;
+    }
+
+    return true;
 }
 
 ovrSession acquireOculusSession() {

From 78626f793831bd603e4dbdf400cafcb18a631a92 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 28 Mar 2016 13:00:15 -0700
Subject: [PATCH 03/35] Add warning logging if we can't find a 1.x Oculus dll

---
 plugins/oculus/src/OculusHelpers.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index fdd35a06fe..cfac175392 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -51,6 +51,7 @@ bool oculusAvailable() {
     // HACK Explicitly check for the presence of the 1.0 runtime DLL, and fail if it 
     // doesn't exist
     if (!QFile(GOOD_OCULUS_RUNTIME_FILE).exists()) {
+        qCWarning(oculus) << "Oculus Runtime detected, but no 1.x DLL present.";
         return false;
     }
 

From 80d397555ddb7388d8a60ea054df58b6eb30047c Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 28 Mar 2016 14:45:09 -0700
Subject: [PATCH 04/35] Fixing input API, DLL path for Oculus

---
 plugins/oculus/src/OculusControllerManager.cpp | 3 ++-
 plugins/oculus/src/OculusControllerManager.h   | 2 +-
 plugins/oculus/src/OculusHelpers.cpp           | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/oculus/src/OculusControllerManager.cpp b/plugins/oculus/src/OculusControllerManager.cpp
index 0761dc1655..f11ec18b10 100644
--- a/plugins/oculus/src/OculusControllerManager.cpp
+++ b/plugins/oculus/src/OculusControllerManager.cpp
@@ -35,7 +35,7 @@ bool OculusControllerManager::isSupported() const {
     return oculusAvailable();
 }
 
-void OculusControllerManager::activate() {
+bool OculusControllerManager::activate() {
     InputPlugin::activate();
     if (!_session) {
         _session = acquireOculusSession();
@@ -50,6 +50,7 @@ void OculusControllerManager::activate() {
     if (_touch) {
         userInputMapper->registerDevice(_touch);
     }
+    return true;
 }
 
 void OculusControllerManager::deactivate() {
diff --git a/plugins/oculus/src/OculusControllerManager.h b/plugins/oculus/src/OculusControllerManager.h
index fb126ca2a8..fc10dcc73d 100644
--- a/plugins/oculus/src/OculusControllerManager.h
+++ b/plugins/oculus/src/OculusControllerManager.h
@@ -27,7 +27,7 @@ public:
     bool isJointController() const override { return true; }
     const QString& getName() const override { return NAME; }
 
-    void activate() override;
+    bool activate() override;
     void deactivate() override;
 
     void pluginFocusOutEvent() override;
diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index cfac175392..fb49d1d001 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -12,6 +12,7 @@
 
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QFile>
+#include <QtCore/QDir>
 
 using Mutex = std::mutex;
 using Lock = std::unique_lock<Mutex>;
@@ -40,7 +41,8 @@ void logFatal(const char* what) {
     qFatal(error.c_str());
 }
 
-static const QString GOOD_OCULUS_RUNTIME_FILE { "C:\\Program Files(x86)\\Oculus\\Support\\oculus - runtime\\LibOVRRT64_1.dll" };
+static const QString OCULUS_RUNTIME_PATH { "C:\\Program Files (x86)\\Oculus\\Support\\oculus-runtime" };
+static const QString GOOD_OCULUS_RUNTIME_FILE { OCULUS_RUNTIME_PATH + "\\LibOVRRT64_1.dll" };
 
 bool oculusAvailable() {
     ovrDetectResult detect = ovr_Detect(0);

From 8123617fe1e50e695b28368a2b0beb474768f173 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 29 Mar 2016 09:41:38 -0700
Subject: [PATCH 05/35] Improve failure detection logging

---
 plugins/oculus/src/OculusHelpers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index fb49d1d001..98dfa43fa2 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -53,7 +53,7 @@ bool oculusAvailable() {
     // HACK Explicitly check for the presence of the 1.0 runtime DLL, and fail if it 
     // doesn't exist
     if (!QFile(GOOD_OCULUS_RUNTIME_FILE).exists()) {
-        qCWarning(oculus) << "Oculus Runtime detected, but no 1.x DLL present.";
+        qCWarning(oculus) << "Oculus Runtime detected, but no 1.x DLL present: \"" + GOOD_OCULUS_RUNTIME_FILE + "\"";
         return false;
     }
 

From f569cbf70ef40c15699acb31ef374e5b31c25cee Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Mar 2016 09:56:26 -0700
Subject: [PATCH 06/35] Add debugging output, fix timewarp

---
 interface/src/Application.cpp                 | 25 +++++++++++------
 .../display-plugins/OpenGLDisplayPlugin.cpp   |  4 +--
 .../src/display-plugins/OpenGLDisplayPlugin.h |  2 +-
 .../display-plugins/hmd/HmdDisplayPlugin.cpp  | 28 ++++++++++++++-----
 .../display-plugins/hmd/HmdDisplayPlugin.h    | 18 +++++++++---
 libraries/plugins/src/plugins/DisplayPlugin.h |  4 ++-
 libraries/shared/src/ThreadSafeValueCache.h   |  1 +
 .../oculus/src/OculusBaseDisplayPlugin.cpp    | 15 ++++++----
 plugins/oculus/src/OculusBaseDisplayPlugin.h  |  3 +-
 plugins/oculus/src/OculusDisplayPlugin.cpp    | 28 ++++++++++++++-----
 plugins/oculus/src/OculusDisplayPlugin.h      |  3 +-
 plugins/oculus/src/OculusHelpers.cpp          |  3 +-
 .../src/OculusLegacyDisplayPlugin.cpp         | 10 +++++--
 .../src/OculusLegacyDisplayPlugin.h           |  2 +-
 plugins/openvr/src/OpenVrDisplayPlugin.cpp    | 22 +++++++++------
 plugins/openvr/src/OpenVrDisplayPlugin.h      |  2 +-
 16 files changed, 117 insertions(+), 53 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index de9b134b83..895f3fd52f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1490,11 +1490,15 @@ void Application::paintGL() {
     // FIXME not needed anymore?
     _offscreenContext->makeCurrent();
 
-    displayPlugin->updateHeadPose(_frameCount);
+    displayPlugin->beginFrameRender(_frameCount);
 
     // update the avatar with a fresh HMD pose
     getMyAvatar()->updateFromHMDSensorMatrix(getHMDSensorPose());
 
+    // update sensorToWorldMatrix for camera and hand controllers
+    getMyAvatar()->updateSensorToWorldMatrix();
+
+
     auto lodManager = DependencyManager::get<LODManager>();
 
 
@@ -2007,6 +2011,12 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 }
                 break;
 
+            case Qt::Key_Y:
+                if (isShifted && isMeta) {
+                    getActiveDisplayPlugin()->cycleDebugOutput();
+                }
+                break;
+
             case Qt::Key_B:
                 if (isMeta) {
                     auto offscreenUi = DependencyManager::get<OffscreenUi>();
@@ -2572,11 +2582,6 @@ void Application::idle(uint64_t now) {
         return; // bail early, nothing to do here.
     }
 
-    checkChangeCursor();
-
-    Stats::getInstance()->updateStats();
-    AvatarInputs::getInstance()->update();
-
     // These tasks need to be done on our first idle, because we don't want the showing of
     // overlay subwindows to do a showDesktop() until after the first time through
     static bool firstIdle = true;
@@ -2625,6 +2630,11 @@ void Application::idle(uint64_t now) {
     // We're going to execute idle processing, so restart the last idle timer
     _lastTimeUpdated.start();
 
+    checkChangeCursor();
+
+    Stats::getInstance()->updateStats();
+    AvatarInputs::getInstance()->update();
+
     {
         static uint64_t lastIdleStart{ now };
         uint64_t idleStartToStartDuration = now - lastIdleStart;
@@ -3389,9 +3399,6 @@ void Application::update(float deltaTime) {
 
         qApp->updateMyAvatarLookAtPosition();
 
-        // update sensorToWorldMatrix for camera and hand controllers
-        myAvatar->updateSensorToWorldMatrix();
-
         {
             PROFILE_RANGE_EX("MyAvatar", 0xffff00ff, (uint64_t)getActiveDisplayPlugin()->presentCount());
             avatarManager->updateMyAvatar(deltaTime);
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 8049e2d5a5..e5d98d18f7 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -552,9 +552,9 @@ float OpenGLDisplayPlugin::presentRate() {
     {
         Lock lock(_mutex);
         result = _usecsPerFrame.getAverage();
-        result = 1.0f / result; 
-        result *= USECS_PER_SECOND;
     }
+    result = 1.0f / result; 
+    result *= USECS_PER_SECOND;
     return result;
 }
 
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index b9628deb6c..8c4862ee3d 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -17,9 +17,9 @@
 #include <GLMHelpers.h>
 #include <SimpleMovingAverage.h>
 #include <gl/OglplusHelpers.h>
+#include <gl/GLEscrow.h>
 
 #define THREADED_PRESENT 1
-#include <gl/GLEscrow.h>
 
 class OpenGLDisplayPlugin : public DisplayPlugin {
 protected:
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
index 5be3f0d96a..505fa004ab 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -69,10 +69,11 @@ void HmdDisplayPlugin::compositeOverlay() {
         // set the alpha
         Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
 
+        auto eyePoses = _currentPresentFrameInfo.eyePoses;
         _sphereSection->Use();
         for_each_eye([&](Eye eye) {
             eyeViewport(eye);
-            auto modelView = glm::inverse(_currentRenderEyePoses[eye]); // *glm::translate(mat4(), vec3(0, 0, -1));
+            auto modelView = glm::inverse(eyePoses[eye]); // *glm::translate(mat4(), vec3(0, 0, -1));
             auto mvp = _eyeProjections[eye] * modelView;
             Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp);
             _sphereSection->Draw();
@@ -95,10 +96,10 @@ void HmdDisplayPlugin::compositePointer() {
         // Mouse pointer
         _plane->Use();
         // Reconstruct the headpose from the eye poses
-        auto headPosition = (vec3(_currentRenderEyePoses[Left][3]) + vec3(_currentRenderEyePoses[Right][3])) / 2.0f;
+        auto headPosition = vec3(_currentPresentFrameInfo.headPose[3]);
         for_each_eye([&](Eye eye) {
             eyeViewport(eye);
-            auto reticleTransform = compositorHelper->getReticleTransform(_currentRenderEyePoses[eye], headPosition);
+            auto reticleTransform = compositorHelper->getReticleTransform(_currentPresentFrameInfo.eyePoses[eye], headPosition);
             auto mvp = _eyeProjections[eye] * reticleTransform;
             Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp);
             _plane->Draw();
@@ -160,15 +161,28 @@ void HmdDisplayPlugin::internalPresent() {
 
 void HmdDisplayPlugin::setEyeRenderPose(uint32_t frameIndex, Eye eye, const glm::mat4& pose) {
     Lock lock(_mutex);
-    _renderEyePoses[frameIndex][eye] = pose;
+    FrameInfo& frame = _frameInfos[frameIndex];
+    frame.eyePoses[eye] = pose;
 }
 
 void HmdDisplayPlugin::updateFrameData() {
+    // Check if we have old frame data to discard
+    {
+        Lock lock(_mutex);
+        auto itr = _frameInfos.find(_currentRenderFrameIndex);
+        if (itr != _frameInfos.end()) {
+            _frameInfos.erase(itr);
+        }
+    }
+
     Parent::updateFrameData();
-    Lock lock(_mutex);
-    _currentRenderEyePoses = _renderEyePoses[_currentRenderFrameIndex];
+
+    {
+        Lock lock(_mutex);
+        _currentPresentFrameInfo = _frameInfos[_currentRenderFrameIndex];
+    }
 }
 
 glm::mat4 HmdDisplayPlugin::getHeadPose() const {
-    return _headPoseCache.get();
+    return _currentRenderFrameInfo.get().headPose;
 }
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
index 080a44bc66..899dd6636a 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
@@ -28,6 +28,16 @@ public:
 
     virtual glm::mat4 getHeadPose() const override;
 
+    using EyePoses = std::array<glm::mat4, 2>;
+
+    struct FrameInfo {
+        EyePoses eyePoses;
+        glm::mat4 headPose;
+        double sensorSampleTime { 0 };
+        double predictedDisplayTime { 0 };
+    };
+
+
 protected:
     virtual void hmdPresent() = 0;
     virtual bool isHmdMounted() const = 0;
@@ -46,10 +56,10 @@ protected:
     glm::mat4 _cullingProjection;
     glm::uvec2 _renderTargetSize;
     float _ipd { 0.064f };
-    using EyePoses = std::array<glm::mat4, 2>;
-    QMap<uint32_t, EyePoses> _renderEyePoses;
-    EyePoses _currentRenderEyePoses;
-    ThreadSafeValueCache<glm::mat4> _headPoseCache { glm::mat4() };
+
+    QMap<uint32_t, FrameInfo> _frameInfos;
+    FrameInfo _currentPresentFrameInfo;
+    ThreadSafeValueCache<FrameInfo> _currentRenderFrameInfo;
 
 private:
     bool _enablePreview { false };
diff --git a/libraries/plugins/src/plugins/DisplayPlugin.h b/libraries/plugins/src/plugins/DisplayPlugin.h
index f4f28176c7..77d984f924 100644
--- a/libraries/plugins/src/plugins/DisplayPlugin.h
+++ b/libraries/plugins/src/plugins/DisplayPlugin.h
@@ -122,7 +122,7 @@ public:
     }
 
     // will query the underlying hmd api to compute the most recent head pose
-    virtual void updateHeadPose(uint32_t frameIndex) {}
+    virtual void beginFrameRender(uint32_t frameIndex) {}
 
     // returns a copy of the most recent head pose, computed via updateHeadPose
     virtual glm::mat4 getHeadPose() const {
@@ -142,6 +142,8 @@ public:
     virtual float presentRate() { return -1.0f; }
     uint32_t presentCount() const { return _presentedFrameIndex; }
 
+    virtual void cycleDebugOutput() {}
+
     static const QString& MENU_PATH();
 
 signals:
diff --git a/libraries/shared/src/ThreadSafeValueCache.h b/libraries/shared/src/ThreadSafeValueCache.h
index e4e78ca3d7..37a1258aa1 100644
--- a/libraries/shared/src/ThreadSafeValueCache.h
+++ b/libraries/shared/src/ThreadSafeValueCache.h
@@ -23,6 +23,7 @@
 template <typename T>
 class ThreadSafeValueCache {
 public:
+    ThreadSafeValueCache() {}
     ThreadSafeValueCache(const T& v) : _value { v } {}
 
     // returns atomic copy of the cached value.
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
index 8f4e8d665d..52eb70134d 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
@@ -15,11 +15,16 @@ void OculusBaseDisplayPlugin::resetSensors() {
     ovr_RecenterTrackingOrigin(_session);
 }
 
-void OculusBaseDisplayPlugin::updateHeadPose(uint32_t frameIndex) {
-    auto displayTime = ovr_GetPredictedDisplayTime(_session, frameIndex);
-    auto trackingState = ovr_GetTrackingState(_session, displayTime, true);
-    mat4 headPose = toGlm(trackingState.HeadPose.ThePose);
-    _headPoseCache.set(headPose);
+void OculusBaseDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
+    FrameInfo frame;
+    frame.sensorSampleTime = ovr_GetTimeInSeconds();;
+    frame.predictedDisplayTime = ovr_GetPredictedDisplayTime(_session, frameIndex);
+    auto trackingState = ovr_GetTrackingState(_session, frame.predictedDisplayTime, ovrTrue);
+    frame.headPose = toGlm(trackingState.HeadPose.ThePose);
+
+    _currentRenderFrameInfo.set(frame);
+    Lock lock(_mutex);
+    _frameInfos[frameIndex] = frame;
 }
 
 bool OculusBaseDisplayPlugin::isSupported() const {
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h
index 41344335f3..2259a4ca89 100644
--- a/plugins/oculus/src/OculusBaseDisplayPlugin.h
+++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h
@@ -20,7 +20,8 @@ public:
 
     // Stereo specific methods
     virtual void resetSensors() override final;
-    virtual void updateHeadPose(uint32_t frameIndex) override;
+    virtual void beginFrameRender(uint32_t frameIndex) override;
+    
 
 protected:
     void customizeContext() override;
diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp
index 1a5a32ffb2..8078e8d6ec 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusDisplayPlugin.cpp
@@ -10,6 +10,23 @@
 #include "OculusHelpers.h"
 
 const QString OculusDisplayPlugin::NAME("Oculus Rift");
+static ovrPerfHudMode currentDebugMode = ovrPerfHud_Off;
+
+bool OculusDisplayPlugin::internalActivate() {
+    bool result = Parent::internalActivate();
+    currentDebugMode = ovrPerfHud_Off;
+    if (result && _session) {
+        ovr_SetInt(_session, OVR_PERF_HUD_MODE, currentDebugMode);
+    }
+    return result;
+}
+
+void OculusDisplayPlugin::cycleDebugOutput() {
+    if (_session) {
+        currentDebugMode = static_cast<ovrPerfHudMode>((currentDebugMode + 1) % ovrPerfHud_Count);
+        ovr_SetInt(_session, OVR_PERF_HUD_MODE, currentDebugMode);
+    }
+}
 
 void OculusDisplayPlugin::customizeContext() {
     Parent::customizeContext();
@@ -48,12 +65,6 @@ void blit(const SrcFbo& srcFbo, const DstFbo& dstFbo) {
     });
 }
 
-void OculusDisplayPlugin::updateFrameData() {
-    Parent::updateFrameData();
-    _sceneLayer.RenderPose[ovrEyeType::ovrEye_Left] = ovrPoseFromGlm(_currentRenderEyePoses[Left]);
-    _sceneLayer.RenderPose[ovrEyeType::ovrEye_Right] = ovrPoseFromGlm(_currentRenderEyePoses[Right]);
-}
-
 void OculusDisplayPlugin::hmdPresent() {
 
     PROFILE_RANGE_EX(__FUNCTION__, 0xff00ff00, (uint64_t)_currentRenderFrameIndex)
@@ -63,12 +74,15 @@ void OculusDisplayPlugin::hmdPresent() {
     }
 
     blit(_compositeFramebuffer, _sceneFbo);
+    _sceneFbo->Commit();
     {
+        _sceneLayer.SensorSampleTime = _currentPresentFrameInfo.sensorSampleTime;
+        _sceneLayer.RenderPose[ovrEyeType::ovrEye_Left] = ovrPoseFromGlm(_currentPresentFrameInfo.headPose);
+        _sceneLayer.RenderPose[ovrEyeType::ovrEye_Right] = ovrPoseFromGlm(_currentPresentFrameInfo.headPose);
         ovrLayerHeader* layers = &_sceneLayer.Header;
         ovrResult result = ovr_SubmitFrame(_session, _currentRenderFrameIndex, &_viewScaleDesc, &layers, 1);
         if (!OVR_SUCCESS(result)) {
             logWarning("Failed to present");
         }
     }
-    _sceneFbo->Commit();
 }
diff --git a/plugins/oculus/src/OculusDisplayPlugin.h b/plugins/oculus/src/OculusDisplayPlugin.h
index 9b6b922f69..e7d7791e7f 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.h
+++ b/plugins/oculus/src/OculusDisplayPlugin.h
@@ -22,12 +22,13 @@ public:
     float getTargetFrameRate() override { return TARGET_RATE_Oculus; }
 
 protected:
+    bool internalActivate() override;
     void hmdPresent() override;
     // FIXME update with Oculus API call once it's available in the SDK
     bool isHmdMounted() const override { return true; }
     void customizeContext() override;
     void uncustomizeContext() override;
-    void updateFrameData() override;
+    void cycleDebugOutput() override;
 
 private:
     static const QString NAME;
diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp
index 98dfa43fa2..c9e702ecd0 100644
--- a/plugins/oculus/src/OculusHelpers.cpp
+++ b/plugins/oculus/src/OculusHelpers.cpp
@@ -116,7 +116,8 @@ SwapFramebufferWrapper::~SwapFramebufferWrapper() {
 }
 
 void SwapFramebufferWrapper::Commit() {
-    ovr_CommitTextureSwapChain(_session, color);
+    auto result = ovr_CommitTextureSwapChain(_session, color);
+    Q_ASSERT(OVR_SUCCESS(result));
 }
 
 void SwapFramebufferWrapper::Resize(const uvec2 & size) {
diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
index 396f55b932..7b9dcc0b7d 100644
--- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
+++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
@@ -35,10 +35,14 @@ void OculusLegacyDisplayPlugin::resetSensors() {
     ovrHmd_RecenterPose(_hmd);
 }
 
-void OculusLegacyDisplayPlugin::updateHeadPose(uint32_t frameIndex) {
+void OculusLegacyDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
+    FrameInfo frame;
+    frame.predictedDisplayTime = frame.sensorSampleTime = ovr_GetTimeInSeconds();
+    _trackingState = ovrHmd_GetTrackingState(_hmd, frame.predictedDisplayTime);
+    frame.headPose = toGlm(_trackingState.HeadPose.ThePose);
+    _currentRenderFrameInfo.set(frame);
     Lock lock(_mutex);
-    _trackingState = ovrHmd_GetTrackingState(_hmd, ovr_GetTimeInSeconds());
-    _headPoseCache.set(toGlm(_trackingState.HeadPose.ThePose));
+    _frameInfos[frameIndex] = frame;
 }
 
 bool OculusLegacyDisplayPlugin::isSupported() const {
diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
index 187c0681e9..2710ab1335 100644
--- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
+++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
@@ -26,7 +26,7 @@ public:
 
     // Stereo specific methods
     virtual void resetSensors() override;
-    virtual void updateHeadPose(uint32_t frameIndex) override;
+    virtual void beginFrameRender(uint32_t frameIndex) override;
 
     virtual float getTargetFrameRate() override;
 
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index c4d8b252f0..f968ae440e 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -121,22 +121,23 @@ void OpenVrDisplayPlugin::resetSensors() {
     _sensorResetMat = glm::inverse(cancelOutRollAndPitch(m));
 }
 
-void OpenVrDisplayPlugin::updateHeadPose(uint32_t frameIndex) {
+void OpenVrDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
 
-    float displayFrequency = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_DisplayFrequency_Float);
-    float frameDuration = 1.f / displayFrequency;
-    float vsyncToPhotons = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_SecondsFromVsyncToPhotons_Float);
+    double displayFrequency = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_DisplayFrequency_Float);
+    double frameDuration = 1.f / displayFrequency;
+    double vsyncToPhotons = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_SecondsFromVsyncToPhotons_Float);
 
+    FrameInfo frame;
 #if THREADED_PRESENT
     // 3 frames of prediction + vsyncToPhotons = 44ms total
-    const float NUM_PREDICTION_FRAMES = 3.0f;
-    float predictedSecondsFromNow = NUM_PREDICTION_FRAMES * frameDuration + vsyncToPhotons;
+    const double NUM_PREDICTION_FRAMES = 3.0f;
+    frame.predictedDisplayTime = NUM_PREDICTION_FRAMES * frameDuration + vsyncToPhotons;
 #else
-    float predictedSecondsFromNow = frameDuration + vsyncToPhotons;
+    frame.predictedDisplayTime = frameDuration + vsyncToPhotons;
 #endif
 
     vr::TrackedDevicePose_t predictedTrackedDevicePose[vr::k_unMaxTrackedDeviceCount];
-    _system->GetDeviceToAbsoluteTrackingPose(vr::TrackingUniverseStanding, predictedSecondsFromNow, predictedTrackedDevicePose, vr::k_unMaxTrackedDeviceCount);
+    _system->GetDeviceToAbsoluteTrackingPose(vr::TrackingUniverseStanding, frame.predictedDisplayTime, predictedTrackedDevicePose, vr::k_unMaxTrackedDeviceCount);
 
     // copy and process predictedTrackedDevicePoses
     for (int i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) {
@@ -145,8 +146,11 @@ void OpenVrDisplayPlugin::updateHeadPose(uint32_t frameIndex) {
         _trackedDeviceLinearVelocities[i] = transformVectorFast(_sensorResetMat, toGlm(_trackedDevicePose[i].vVelocity));
         _trackedDeviceAngularVelocities[i] = transformVectorFast(_sensorResetMat, toGlm(_trackedDevicePose[i].vAngularVelocity));
     }
+    frame.headPose = _trackedDevicePoseMat4[0];
+    _currentRenderFrameInfo.set(frame);
 
-    _headPoseCache.set(_trackedDevicePoseMat4[0]);
+    Lock lock(_mutex);
+    _frameInfos[frameIndex] = frame;
 }
 
 void OpenVrDisplayPlugin::hmdPresent() {
diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.h b/plugins/openvr/src/OpenVrDisplayPlugin.h
index 022af5b06d..0e1e7c5267 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.h
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.h
@@ -27,7 +27,7 @@ public:
 
     // Stereo specific methods
     virtual void resetSensors() override;
-    virtual void updateHeadPose(uint32_t frameIndex) override;
+    virtual void beginFrameRender(uint32_t frameIndex) override;
 
 protected:
     bool internalActivate() override;

From 24acf7584a2f336d35d8b8a2316ee8957443d5db Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 11:10:14 -0700
Subject: [PATCH 07/35] don't respond to http other than /status

---
 ice-server/src/IceServer.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index d7fba12f26..2d52f9fc82 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -313,7 +313,10 @@ bool IceServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, b
                                 ? 1 : 0;
 
             connection->respond(HTTPConnection::StatusCode200, QByteArray::number(statusNumber));
+
+            return true;
         }
     }
-    return true;
+
+    return false;
 }

From 1771875186873097789cbabdbd376b6925ae974d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 11:31:46 -0700
Subject: [PATCH 08/35] use one QNetworkAccessManager for the ice-server

---
 ice-server/src/IceServer.cpp | 9 +++++----
 ice-server/src/IceServer.h   | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index 2d52f9fc82..ac5952ce43 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -33,7 +33,8 @@ IceServer::IceServer(int argc, char* argv[]) :
     _id(QUuid::createUuid()),
     _serverSocket(),
     _activePeers(),
-    _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this)
+    _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this),
+    _networkAccessManager(this)
 {
     // start the ice-server socket
     qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT;
@@ -201,8 +202,8 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla
 
 void IceServer::requestDomainPublicKey(const QUuid& domainID) {
     // send a request to the metaverse API for the public key for this domain
-    QNetworkAccessManager* manager = new QNetworkAccessManager { this };
-    connect(manager, &QNetworkAccessManager::finished, this, &IceServer::publicKeyReplyFinished);
+    
+    connect(&_networkAccessManager, &QNetworkAccessManager::finished, this, &IceServer::publicKeyReplyFinished);
 
     QUrl publicKeyURL { NetworkingConstants::METAVERSE_SERVER_URL };
     QString publicKeyPath = QString("/api/v1/domains/%1/public_key").arg(uuidStringWithoutCurlyBraces(domainID));
@@ -213,7 +214,7 @@ void IceServer::requestDomainPublicKey(const QUuid& domainID) {
 
     qDebug() << "Requesting public key for domain with ID" << domainID;
 
-    manager->get(publicKeyRequest);
+    _networkAccessManager.get(publicKeyRequest);
 }
 
 void IceServer::publicKeyReplyFinished(QNetworkReply* reply) {
diff --git a/ice-server/src/IceServer.h b/ice-server/src/IceServer.h
index 6cc33fd8fc..2f9ee9c727 100644
--- a/ice-server/src/IceServer.h
+++ b/ice-server/src/IceServer.h
@@ -54,6 +54,8 @@ private:
 
     HTTPManager _httpManager;
 
+    QNetworkAccessManager _networkAccessManager;
+
     using RSAUniquePtr = std::unique_ptr<RSA, std::function<void(RSA*)>>;
     using DomainPublicKeyHash = std::unordered_map<QUuid, RSAUniquePtr>;
     DomainPublicKeyHash _domainPublicKeys;

From 92e9e6a3fa35879cd7282920d4a7f6f0f89ef70a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 11:35:41 -0700
Subject: [PATCH 09/35] use the NetworkAccessManager to get a single
 QNetworkAccessManager

---
 ice-server/src/IceServer.cpp | 10 +++++-----
 ice-server/src/IceServer.h   |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index ac5952ce43..7bd8306e9b 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -19,6 +19,7 @@
 #include <QtNetwork/QNetworkRequest>
 
 #include <LimitedNodeList.h>
+#include <NetworkAccessManager.h>
 #include <NetworkingConstants.h>
 #include <udt/PacketHeaders.h>
 #include <SharedUtil.h>
@@ -33,8 +34,7 @@ IceServer::IceServer(int argc, char* argv[]) :
     _id(QUuid::createUuid()),
     _serverSocket(),
     _activePeers(),
-    _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this),
-    _networkAccessManager(this)
+    _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this)
 {
     // start the ice-server socket
     qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT;
@@ -202,8 +202,8 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla
 
 void IceServer::requestDomainPublicKey(const QUuid& domainID) {
     // send a request to the metaverse API for the public key for this domain
-    
-    connect(&_networkAccessManager, &QNetworkAccessManager::finished, this, &IceServer::publicKeyReplyFinished);
+    auto& networkAccessManager = NetworkAccessManager::getInstance();
+    connect(&networkAccessManager, &QNetworkAccessManager::finished, this, &IceServer::publicKeyReplyFinished);
 
     QUrl publicKeyURL { NetworkingConstants::METAVERSE_SERVER_URL };
     QString publicKeyPath = QString("/api/v1/domains/%1/public_key").arg(uuidStringWithoutCurlyBraces(domainID));
@@ -214,7 +214,7 @@ void IceServer::requestDomainPublicKey(const QUuid& domainID) {
 
     qDebug() << "Requesting public key for domain with ID" << domainID;
 
-    _networkAccessManager.get(publicKeyRequest);
+    networkAccessManager.get(publicKeyRequest);
 }
 
 void IceServer::publicKeyReplyFinished(QNetworkReply* reply) {
diff --git a/ice-server/src/IceServer.h b/ice-server/src/IceServer.h
index 2f9ee9c727..6cc33fd8fc 100644
--- a/ice-server/src/IceServer.h
+++ b/ice-server/src/IceServer.h
@@ -54,8 +54,6 @@ private:
 
     HTTPManager _httpManager;
 
-    QNetworkAccessManager _networkAccessManager;
-
     using RSAUniquePtr = std::unique_ptr<RSA, std::function<void(RSA*)>>;
     using DomainPublicKeyHash = std::unordered_map<QUuid, RSAUniquePtr>;
     DomainPublicKeyHash _domainPublicKeys;

From e5adfc40b2a8f02354a851ea49fad316453fd339 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 11:42:41 -0700
Subject: [PATCH 10/35] use the inactivity timer for ice-server lockup check

---
 ice-server/src/IceServer.cpp | 8 ++++----
 ice-server/src/IceServer.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index 7bd8306e9b..128c2b27b0 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -69,8 +69,6 @@ bool IceServer::packetVersionMatch(const udt::Packet& packet) {
 
 void IceServer::processPacket(std::unique_ptr<udt::Packet> packet) {
 
-    _lastPacketTimestamp = QDateTime::currentMSecsSinceEpoch();
-
     auto nlPacket = NLPacket::fromBase(std::move(packet));
     
     // make sure that this packet at least looks like something we can read
@@ -282,6 +280,8 @@ void IceServer::sendPeerInformationPacket(const NetworkPeer& peer, const HifiSoc
 void IceServer::clearInactivePeers() {
     NetworkPeerHash::iterator peerItem = _activePeers.begin();
 
+    _lastInactiveCheckTimestamp = QDateTime::currentMSecsSinceEpoch();
+
     while (peerItem != _activePeers.end()) {
         SharedNetworkPeer peer = peerItem.value();
 
@@ -310,8 +310,8 @@ bool IceServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, b
 
             const quint64 MAX_PACKET_GAP_MS_FOR_STUCK_SOCKET = 10 * 1000;
 
-            int statusNumber = (QDateTime::currentMSecsSinceEpoch() - _lastPacketTimestamp > MAX_PACKET_GAP_MS_FOR_STUCK_SOCKET)
-                                ? 1 : 0;
+            auto sinceLastInactiveCheck = QDateTime::currentMSecsSinceEpoch() - _lastInactiveCheckTimestamp;
+            int statusNumber = (sinceLastInactiveCheck > MAX_PACKET_GAP_MS_FOR_STUCK_SOCKET) ? 1 : 0;
 
             connection->respond(HTTPConnection::StatusCode200, QByteArray::number(statusNumber));
 
diff --git a/ice-server/src/IceServer.h b/ice-server/src/IceServer.h
index 6cc33fd8fc..7d1d05324c 100644
--- a/ice-server/src/IceServer.h
+++ b/ice-server/src/IceServer.h
@@ -58,7 +58,7 @@ private:
     using DomainPublicKeyHash = std::unordered_map<QUuid, RSAUniquePtr>;
     DomainPublicKeyHash _domainPublicKeys;
 
-    quint64 _lastPacketTimestamp;
+    quint64 _lastInactiveCheckTimestamp;
 };
 
 #endif // hifi_IceServer_h

From 4210bc178e1302275a75fd2a7c8f6814e01facb3 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 11:44:55 -0700
Subject: [PATCH 11/35] default the inactive timestamp for healthy startup

---
 ice-server/src/IceServer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index 128c2b27b0..9d1bb58ddf 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -34,7 +34,8 @@ IceServer::IceServer(int argc, char* argv[]) :
     _id(QUuid::createUuid()),
     _serverSocket(),
     _activePeers(),
-    _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this)
+    _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this),
+	_lastInactiveCheckTimestamp(QDateTime::currentMSecsSinceEpoch())
 {
     // start the ice-server socket
     qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT;

From 6bdedeb5cec21b600a88eac5d32abe3cf2fc9373 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 11:59:49 -0700
Subject: [PATCH 12/35] change packaging parameters for Sandbox/Interface

---
 cmake/macros/GenerateInstallers.cmake     |  4 ++--
 cmake/macros/SetPackagingParameters.cmake | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index b4744aa172..8d1eca84d7 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -85,8 +85,8 @@ macro(GENERATE_INSTALLERS)
 
   set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 
-  cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Client")
-  cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Server")
+  cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Interface")
+  cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Sandbox")
 
   include(CPack)
 endmacro()
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 92e3273f67..1886ca36ac 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -53,7 +53,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
     set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME})
 
-    set(CONSOLE_EXEC_NAME "Server Console.app")
+    set(CONSOLE_EXEC_NAME "Sandbox.app")
     set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}")
 
     set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")
@@ -64,7 +64,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns")
   else ()
     if (WIN32)
-      set(CONSOLE_INSTALL_DIR "server-console")
+      set(CONSOLE_INSTALL_DIR "sandbox")
     else ()
       set(CONSOLE_INSTALL_DIR ".")
     endif ()
@@ -77,18 +77,18 @@ macro(SET_PACKAGING_PARAMETERS)
     set(INTERFACE_EXEC_PREFIX "interface")
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico")
 
-    set(CONSOLE_EXEC_NAME "server-console.exe")
+    set(CONSOLE_EXEC_NAME "sandbox.exe")
 
     set(DS_EXEC_NAME "domain-server.exe")
     set(AC_EXEC_NAME "assignment-client.exe")
 
     # shortcut names
     if (PRODUCTION_BUILD)
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity")
-      set(CONSOLE_SHORTCUT_NAME "Server Console")
+      set(INTERFACE_SHORTCUT_NAME "Interface")
+      set(CONSOLE_SHORTCUT_NAME "Sandbox")
     else ()
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity - ${BUILD_VERSION}")
-      set(CONSOLE_SHORTCUT_NAME "Server Console - ${BUILD_VERSION}")
+      set(INTERFACE_SHORTCUT_NAME "Interface - ${BUILD_VERSION}")
+      set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}")
     endif ()
     # check if we need to find signtool
     if (PRODUCTION_BUILD OR PR_BUILD)

From 724c95fbd6bbd363f23ee6871bc314ea28e989a5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:05:17 -0700
Subject: [PATCH 13/35] leave executable name for server-console

---
 cmake/macros/SetPackagingParameters.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 1886ca36ac..cdbddf84e5 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -77,7 +77,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(INTERFACE_EXEC_PREFIX "interface")
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico")
 
-    set(CONSOLE_EXEC_NAME "sandbox.exe")
+    set(CONSOLE_EXEC_NAME "server-console.exe")
 
     set(DS_EXEC_NAME "domain-server.exe")
     set(AC_EXEC_NAME "assignment-client.exe")

From 238f9e9298cc6bf7c9c7c2d532f1208752479c17 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:07:40 -0700
Subject: [PATCH 14/35] remove the Stack Manager migration section

---
 server-console/src/splash.html | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/server-console/src/splash.html b/server-console/src/splash.html
index 30868ebb6f..b9947bcbaa 100644
--- a/server-console/src/splash.html
+++ b/server-console/src/splash.html
@@ -23,7 +23,7 @@ High Fidelity is now installed and your Home domain is ready for you to explore.
                     </p>
 
                     <p>
-You can make your home yours by uploading your own models and scripts, and adding items from the Market.
+You can make your home yours by uploading your own models and scripts.
 
                     </p>
 
@@ -67,12 +67,6 @@ You can make your home yours by uploading your own models and scripts, and addin
                     </script>
                 </div>
             </div>
-            <div id="existing-resources-area">
-                <p>
-                  <h2>Your existing Stack Manager content is safe.</h2>
-                  Server Console comes with demo content but does not overwrite your data. <a target="_blank" href="https://docs.highfidelity.com/v1.0/docs/migrate-sm-to-sc">See our guide to importing content previously managed with Stack Manager</a>.
-                </p>
-            </div>
         </div>
         <div class="bottom">
             <div class="content footer">

From 2ea0309955ea070373fc9cb0589dca5316eeb9d6 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:08:56 -0700
Subject: [PATCH 15/35] change setup options and prompts to close running
 applications

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

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index ca26be6ab0..c0f84a6b7f 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -414,7 +414,7 @@ Function PostInstallOptionsPage
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
-    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity Server Console after install"
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ after install"
   ${Else}
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity after install"
   ${EndIf}
@@ -465,10 +465,10 @@ Function ReadPostInstallOptions
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
-    ; check if the user asked for a desktop shortcut to Server Console
+    ; check if the user asked for a desktop shortcut to Sandbox
     ${NSD_GetState} $DesktopServerCheckbox $DesktopServerState
 
-    ; check if the user asked to have Server Console launched every startup
+    ; check if the user asked to have Sandbox launched every startup
     ${NSD_GetState} $ServerStartupCheckbox $ServerStartupState
   ${EndIf}
 
@@ -494,7 +494,7 @@ Function HandlePostInstallOptions
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
-    ; check if the user asked for a desktop shortcut to Server Console
+    ; check if the user asked for a desktop shortcut to Sandbox
     ${If} $DesktopServerState == ${BST_CHECKED}
       CreateShortCut "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
       !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
@@ -502,7 +502,7 @@ Function HandlePostInstallOptions
       !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
     ${EndIf}
 
-    ; check if the user asked to have Server Console launched every startup
+    ; 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
       SetShellVarContext all
@@ -724,8 +724,8 @@ SectionEnd
 !macroend
 
 !macro CheckForRunningApplications action prompter
-  !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "High Fidelity client" ${action} ${prompter}
-  !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "Server Console" ${action} ${prompter}
+  !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "High Fidelity Interface" ${action} ${prompter}
+  !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "High Fidelity Sandbox" ${action} ${prompter}
   !insertmacro PromptForRunningApplication "@DS_EXEC_NAME@" "Domain Server" ${action} ${prompter}
   !insertmacro PromptForRunningApplication "@AC_EXEC_NAME@" "Assignment Client" ${action} ${prompter}
 !macroend

From bbbfa7227fcc0c908f4d76ace87a1300e0b5393a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:41:13 -0700
Subject: [PATCH 16/35] changes to electron app for Sandbox rename

---
 server-console/.gitignore  |  1 +
 server-console/packager.js |  6 +++---
 server-console/src/main.js | 12 ++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/server-console/.gitignore b/server-console/.gitignore
index 1624823e80..b293c73eb5 100644
--- a/server-console/.gitignore
+++ b/server-console/.gitignore
@@ -1,5 +1,6 @@
 Server\ Console-*/
 server-console-*/
+Sandbox-*/
 electron-packager/
 npm-debug.log
 logs/
diff --git a/server-console/packager.js b/server-console/packager.js
index bf8ddd68d4..1f90a300a3 100644
--- a/server-console/packager.js
+++ b/server-console/packager.js
@@ -23,12 +23,12 @@ var options = {
     arch: "x64",
     platform: platform,
     icon: "resources/" + iconName,
-    ignore: "logs|(S|s)erver(\\s|-)(C|c)onsole-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore"
+    ignore: "logs|(S|s)andbox-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore"
 }
 
 const EXEC_NAME = "server-console";
-const SHORT_NAME = "Server Console";
-const FULL_NAME = "High Fidelity Server Console";
+const SHORT_NAME = "Sandbox";
+const FULL_NAME = "High Fidelity Sandbox";
 
 // setup per OS options
 if (osType == "Darwin") {
diff --git a/server-console/src/main.js b/server-console/src/main.js
index 18cffdb81b..b36d798a30 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -111,8 +111,8 @@ function shutdown() {
             dialog.showMessageBox({
                 type: 'question',
                 buttons: ['Yes', 'No'],
-                title: 'Stopping Server Console',
-                message: 'Quitting will stop your Server Console and your Home domain will no longer be running.\nDo you wish to continue?'
+                title: 'Stopping High Fidelity Sandbox',
+                message: 'Quitting will stop your Sandbox and your Home domain will no longer be running.\nDo you wish to continue?'
             }, shutdownCallback);
         } else {
             shutdownCallback(0);
@@ -212,7 +212,7 @@ var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory)
 });
 
 if (shouldQuit) {
-    console.warn("Another instance of the Server Console is already running - this instance will quit.");
+    console.warn("Another instance of the Sandbox is already running - this instance will quit.");
     app.quit();
     return;
 }
@@ -237,7 +237,7 @@ function binaryMissingMessage(displayName, executableName, required) {
     var message = "The " + displayName + " executable was not found.\n";
 
     if (required) {
-        message += "It is required for the Server Console to run.\n\n";
+        message += "It is required for the High Fidelity Sandbox to run.\n\n";
     } else {
         message += "\n";
     }
@@ -250,7 +250,7 @@ function binaryMissingMessage(displayName, executableName, required) {
         message += paths.join("\n");
     } else {
         message += "It is expected to be found beside this executable.\n";
-        message += "You may need to re-install the Server Console.";
+        message += "You may need to re-install the High Fidelity Sandbox.";
     }
 
     return message;
@@ -770,7 +770,7 @@ app.on('ready', function() {
 
     // Create tray icon
     tray = new Tray(trayIcons[ProcessGroupStates.STOPPED]);
-    tray.setToolTip('High Fidelity Server Console');
+    tray.setToolTip('High Fidelity Sandbox');
 
     tray.on('click', function() {
         tray.popUpContextMenu(tray.menu);

From d80f612c6206e35ed8652a98e6da4de551124e12 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:44:10 -0700
Subject: [PATCH 17/35] continue to ignore old server console output directory

---
 server-console/packager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server-console/packager.js b/server-console/packager.js
index 1f90a300a3..657098d2f4 100644
--- a/server-console/packager.js
+++ b/server-console/packager.js
@@ -23,7 +23,7 @@ var options = {
     arch: "x64",
     platform: platform,
     icon: "resources/" + iconName,
-    ignore: "logs|(S|s)andbox-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore"
+    ignore: "logs|(S|s)erver(\\s|-)(C|c)onsole-\\S+|(S|s)andbox-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore"
 }
 
 const EXEC_NAME = "server-console";

From 2d1c4243f5af3e77939c7db0d5a50f0083c40de1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:47:18 -0700
Subject: [PATCH 18/35] prepend desktop shortcuts with High Fidelity

---
 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 c0f84a6b7f..ba2ffc36a9 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -485,7 +485,7 @@ Function HandlePostInstallOptions
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ; check if the user asked for a desktop shortcut to High Fidelity
     ${If} $DesktopClientState == ${BST_CHECKED}
-      CreateShortCut "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
+      CreateShortCut "$DESKTOP\High Fidelity @INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
       !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES
     ${Else}
       !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO
@@ -496,7 +496,7 @@ Function HandlePostInstallOptions
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
     ; check if the user asked for a desktop shortcut to Sandbox
     ${If} $DesktopServerState == ${BST_CHECKED}
-      CreateShortCut "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
+      CreateShortCut "$DESKTOP\High Fidelity @CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
       !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
     ${Else}
       !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO

From 4940639e11ceaf006f5aa4af3769db2bca162946 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:48:11 -0700
Subject: [PATCH 19/35] clear old desktop shortcuts from before rename

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

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index ba2ffc36a9..8c41b434f4 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -589,6 +589,10 @@ Section "-Core installation"
   Delete "$INSTDIR\version"
   Delete "$INSTDIR\xinput1_3.dll"
 
+  ; Delete old desktop shortcuts before they were renamed
+  Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk"
+  Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk"
+
   ; Rename the incorrectly cased Raleway font
   Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml"
 

From 05163367e16471b7e98029843a1f19567930f3ae Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:49:55 -0700
Subject: [PATCH 20/35] delete old start menu items from before rename

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

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 8c41b434f4..68ce78b560 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -593,6 +593,10 @@ Section "-Core installation"
   Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk"
   Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk"
 
+  ; Delete old startmenu shortcuts before rename
+  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\High Fidelity.lnk"
+  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Server Console.lnk"
+
   ; Rename the incorrectly cased Raleway font
   Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml"
 

From a200e56f924d14714f3841214ba52c9654c48888 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:52:11 -0700
Subject: [PATCH 21/35] remove old startup menu item for Server Console

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

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 68ce78b560..f268feab37 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -589,14 +589,17 @@ Section "-Core installation"
   Delete "$INSTDIR\version"
   Delete "$INSTDIR\xinput1_3.dll"
 
-  ; Delete old desktop shortcuts before they were renamed
+  ; Delete old desktop shortcuts before they were renamed during Sandbox rename
   Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk"
   Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk"
 
-  ; Delete old startmenu shortcuts before rename
+  ; Delete old Start Menu shortcuts before Sandbox rename
   Delete "$SMPROGRAMS\$STARTMENU_FOLDER\High Fidelity.lnk"
   Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Server Console.lnk"
 
+  ; Delete old startup item for Server Console before Sandbox rename
+  Delete "$SMSTARTUP\Server Console.lnk"
+
   ; Rename the incorrectly cased Raleway font
   Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml"
 

From 8e9b337701957c967ea070ccf517bb0530d5aec2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 12:56:09 -0700
Subject: [PATCH 22/35] replace the server console logo with a sandbox logo

---
 .../src/images/console-hf-logo-2x.png         | Bin 12108 -> 12215 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/server-console/src/images/console-hf-logo-2x.png b/server-console/src/images/console-hf-logo-2x.png
index 4c0afd67779133af27925d7c0db7cf98306606b0..420fb18fdeba2ccfb195f5a9955ace35db96f574 100644
GIT binary patch
delta 11449
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

delta 11294
zcmYkicTkhh_dTv4T_N;dLa(7oN0Cq!rAUVW35cLXARwU=>AiQUf&xMa0i+|nS3!gz
zolq1aRY3Z0c)dTrneShBX7|~>=iKM)?#!LjU^ilmWg<#tAO@22_`Gp{_DuP4YA=yo
z>RX~0cNM@gQVLqKn(7(~im5!rjH#zY?En9u*8dHfq3Aq$B5vIhYksV$ZsPNkkVn?Y
z_@n7+2G~#3<3W()weT>F^NW%uEf#dX|6a2g8vRF<>pq)+d<WCtDpI;B26_^Vtsc7H
zqDcFmj>carLnB%_=Ve?kHIgL#`dr2ZI!|~|`*Qceo86NW)g@W7<M-KeOX%#QG0~;h
zmRM*oEecEy3<De$M?!eQ0AO-pu)zNlCZ2vFy`GqyoMd3WjHOSorpkE+4TJ@vD@m<c
z>qQ9_({0adw)?RL(A|#3`ePY_uS+e|;1V(K%U$M70Sp6-Myl0+6;K@bN=w4jGqr^a
zAgh;v-$JXwKZP00-Sa1sCqbgP39u-PfeGOzEd{!WvfLI2r<r4{r-FBLyl{C)P{;k5
zE>U-Xbyo5pymS|%-ksJ3SSU;_Od{t{d_3Zk5h(zV>B;!tG_z6fNX@4$Dcm9nz%<>5
z7RgGmC$D5SxgY-D{^DUjJaBizId9LECGSuWsBtI~?A(v?8`8SaPeAl^&xVB<+RS<H
z{E&eF!KDMN4ox8cTk1zuA%|t9V1JqNn>5#fDbmvCyEt|Go`^V$>xW*-mi(6pMY1tN
z$dV6?D?^{hO|nxz@{$C+Ez4*P3<H3PD$HPYxr}D;x-FYXjiB59lRmYlC9IODxUN(H
z$a6c%T-ntIw=vyzo1NUcLVpJuP-!&aQW}H#kCthrg%S&r8a~QKqtNXGqrJNAe~V~+
zA+0LB(t3_n@<q>B$?-qy>!RfzucyYeOki>#KNdnVSc1Etf#<MM9|{xLEQG=a4t)`d
zn0TWVR>Iq;{jSGo+w~799Nmcy?sE)_<bNdyk52rARhqSubI7)hw4u%+pV%*GRauIu
zRL6G1)FLEIdtoe-ABbnpX&9aUN6Q2bj~o4gm8ig7!f=YXcmUgBtPh|2C4{(|7#X)u
zI@Z4q#_cy=C7PoDtD|@f6=m!p?5q8bpAZ2ag^KZKUytZu&du}Tfv4@i6zE%7!UnD+
z3YmNf2Y{ml87<77K7Gdt@HD4B*uWKEyG*eYFJWW<8sfv9qGSgOVjt6lx`E91Z#chy
z3RQpfw{t@fA1>n_4x<dB*mu{fo#$zBK6;F$6|}vO)DBU@l-ZQrX#S2_z(j}TTa-e#
z8Dc)XQpTxk?9Fu4#@?(S?t;2rCvIUU<WD-%g7QC>VvfNiAF#~w<}8wQ%~S+x)mHLa
zB4au$$hY^E#+Vh({D?o4*I$KqZ$$r_63rzN9m-eTG-d=rM899batdIWi0vSW_wZqt
zKM<MEpeJ)U`x^|p$vr4*tYIg&TdN@@$UPZ<DaQ_)ER8GZb=An6&2;N*BP-C)+zbPN
zqh37z6bk^qbD_BUDXmmoMH3GAXV}m`*l=0hL_0kWRGP8AxE*kwq$(5!05e!X)o)>Q
zb^{_mLeAFtO|CY#>U)k6?DFQFNQ5pXLmU_eC>kK5V!SqlqXd=t9slkJz8ARw6Y<6l
z@3_C|;^Rzdr<~)u$`={GAw)uFQMT7q&((q{BK=mY<;ZMuZ0x17#ruUt)&;FGxd~kg
zSz1b)xj{)pE^cyQ4eMTaDI&FNCz?~25b<KR)PWufks<um;7QYx3}AAg2MBA}RQ0B{
zH?uec<^5ZJ@!fWFtk@ci1da?x+)}&_>fZS6n!Ed5kk(SId&7e)xfja{X?G9iA_Im2
zcq561F$LZ<1Z&#IvmU+Dk7~EXMOo~&@8cw&ojN+&DlGmCqR&w`?BFJI@cgVXNxzba
z@Z-1vcSec!BVl_mt`0$r{1~H%5(Bk#m!WoxpRUWDvs?zK5+sp^J{rW_cG@$F{G7xn
zLSer;IWVkDQjSX8<l8ya(?nAy;ph}7dR4kDj<Jeop1sIPXd$@uLc59WJT3D)c~gww
zw!~_f5}liM1JNDe-d2!2vlhRD_3Z7kJ#KxTYfkKL-~1-an*XEJ`6Xl6j5g{cY<sbH
z?{Vz^$T<XuQ)Zvnh`sKO`dIo1vXEqWWuWWZ4u<vTAXLpv?wl;Zy8kNPT-mHt;&?Br
z9hT$`L0lHUj4QLWZTrxIcO6kRt0t3^!OojjX?IvIRl(m0z8eX@;K#yemS<@PSt3@J
z?>PNAs(>x6!=A~acF0eb1>ncBi#3|*P(lsWk?w!HQ;6e9Y9XMtlX2*Iu{}z%vsKa@
zfAuxzw>IAPE$nbE>P5>V)!owm|72_l{Xq1RXPjG$pFQte;W1Cu40bn!?L<;Ej`7$+
zlMTrjWSSTO0FxU%sFdzy{H_zORET9u1uvF%Y@oU`%I%kgfVb3ihX?oAg@~lm?l=*u
zP2EVxuHiow*f(<%TREUw)02!T(sb9l_|Zo<3esfkiCIe+%I*}q2Bd`9g#IZTDA0Y}
z2nij1XiD(oIPeLgJe|9fQyVw4YA*V+puXKE75Ub8ZTl`>tG=p72pdnpN!(OLkq)Jj
z((*@MS%7!8@k>wox``O+YKQJYG|fgtJN12Ay@~vi06k#ujA<X$-&wKs^YL3BWx+vC
znims(Pj57}6(vi$?Tq(An68@Q>jpkX*hrlL=pU+p$Xhm#yMhY%vn9z(3fSB_*FSNl
z&;;9Lyeu?eZ-)73)`TXP-uoLxjsk`OC@93|{1_Q?JsCuIXuh}I%1uok5^-LP)*WKX
z3D#AUfFbJW<THEb;}PZ5PiNh{?GI0q_#xUlc<c>?k9U|@D6N&&PWoZyFT7|0R0<BY
zK*ENMnkSEH=F}|F?~>A_JO`+lN%hii*2W!8`o*&oS@J%wzgagw8s)`gQ3jn&LBKU@
zj9$@9f%s|`tHD)iiF<RJa}pV({-#ZKYX8pIMa~Jo$zk(b?z=a)IITI9wd%amU|`qS
z&}a#04x%g0nR1VMCOaVCKN`q&aJ~`~d-JAF*+Dti4b`a<*Pp)GRw-!<NX!#<f2K=^
z^yVtG7Q6WX^%y#9`C=}T-<K4bGv7!~DtTEHak(@kytJu(@zA8f?B)cfc6gLoj1T(}
zO!MDKvN+deC_)ooq`CENpE>EKAfx_Byp6nhEZ9hxL`|-ch68Q8-Iz40%;hc76MrJG
zlXk@Em2uDRb>;t33S&FG;~GFV0+=D*9hB+q#sQOtq`$x74g;wOqe)9-))Nvpb!EFV
zofH))G!&>uG%@JBuO@4IAz{v<z1kOd_+Z>;VpFWTgmK|U{$<+GSx4)xRiy`^l)mNj
z=0@mw$5uJ=B`@7EOcS4H%2C<Q=vOcA8-&hQVi(sLg022oV@xcAWrKPdN=9&65f|i`
zGEb~R{Cj82D8H0<eBocMTR4Bq`#9o6UQ`RLHcex4&i%omi{iK$E?^Y+yI65N)^f99
zE%y!X?z_5f`G`u#s!yf+;AkmZcA*#U(_+>TCI9r;!ox*Rj^*xw;bGHUZ<>A&q;dSr
zrk@*2u^TePG5N%+A&om2RkME2_jlwoROF>oc%^eNevjqy^#He;s9M9^j5}tA{^0BO
z(R6A|n_dM$<!r;6_Q?C!Aq=l{CG2Fn6*{o(B9Gd}o#aqS{-}^9-(0xMo_XZE*(DfB
zf#%lactkY(2j<79;0PuO_7V?5sYcFj{7fhoy{HFboC4R*o9-T>`lA^^dbD-3A+{2b
zgJ00dw;UI!SJS7xftC|K`$M>)#ymu9KNIBYb$<$e-w|1`KV8wfU{uzK^qgtNHf?`}
ziFu?jTJ5sTKqQfo>GXfmfN^i!^@(7>hm-EDQ`&Hko)2VkbteEq&^d7bH7E5SzpqCx
z_~Cwij!PtM?I_gq?!#(V(skvSN)g<jr3<Mwz$a6VV}Eu>EX~k7nOp|`Q*{$#eZHQD
z9n{p1Vwdg%d4W`sQIp*2iOpKk#XB;TDUN$j$U67RxwX;jC@T&du^&MJxvQd;KXy-+
zD#Om~DSS}vPG90^rje~sZExwj)R)aUALEXOVfimf*g&X%K;@qZwII!_8tP58E+Yuy
zv?=xi^;h_?%a$qU4Vb#n5y6%tLMtJnGN9E&YaZ~cpw8~;S9;YS#0N+abfj~WD(IfX
zG2c50{_lnn4VfK7oPnMh1x?7x6&`$L7GlL`uFLL^e}-Of-d0vXV|=8gEi|~2U><qL
zj6S5Rb00;Y3QmEGNjieiew~f26X94!W5soi13!?DQm@wb_je9fxc5h7D*4Zd#JJ%}
z-tE@3p1Jrdjw0#Sh{HqG3gwS2B&TQ37cBLm_u>=>zWR;Jsh)&g)Kl9=Y!7M8MvLLS
z@H?rKB1@fmc(sE7P}YyKUN&T@#GG$<rLgDwkEq=BN|K5eutP^4ZhprnZso@pdl+}Z
zp>iki_k~ADRc^;m<u#u1)uP2If6Pjg+UkkhpjLL27_v$#tuH|&9~q-sup3jN4$W@+
zK`ofETPxt^fbHtz<Z^4ZtT4hdZuf|e1=j4pwAI;HaW2jV5xE>Dg*uCCdrIA7V*1qH
zj)J671gKvqu6sU#u18wl3kqbg+|-3WhBjsRN4-Zm96I&mIb5tiLe!jDDK|E$A1}Sj
zGu?@tP9Z*ybKh|w5f`tFqngqjZISCnSnRPn#RRp0Q%2W6y@mPQg^!iln+GjCp!A;)
zqBu}mPFqj>vpd|8p|Chbc-Y6z{9SF&6_wOcPP03`!XoSO_CZ0%lm1YI)SmfkRS+5f
zQkeI*>mMQo=y%)F5qo2TzT;Amkr2@#u_eA?<&QbcJ|~R_@Sfe`c;=!K30_ViqUsj6
zk9c35x$T%$hL#Y$#tx!u$F5Qz12Jg!2V*;M=gQRJ;YyVGUyQfCUsT7>r#p}Hq)`cy
zQrsDbcHJ0|EV0m*z;GsIXj+f~QN_bm$`fcWX-kPwW64swh)Tec$LoudzSw^Gk1<Ti
zhfn_*rYl|$pK@S$e_bF(X|S*RL?`+|h(Qqg<Z}7^-lp33{R<twKZ=Ayvz{ZVF9Yh-
z{SL+71=54W87+)z$x4{N%<p}0vP1omcAsa&T`^JTf9MxU!&*26vizADQ)C!KnbsV=
zu3~AC0_=TzVrNP%DPI3{-mR#AmBPphsrcnxAGEBYnBd{3GV}8Cs|Ho*xI*<(g5tE=
zy3tBh``WxVwbeU(dC^Orn&I(Jav8U~+spnsymB!uNFpBX3|<8Nd$w${tN}wA;BU9x
zuCE(%)arVfV3buQ!ThQ3L*Li!^(t&&1*185%F;dXHeN?!sSd&0$PL_$W?6@~A!z2@
z`M0j*G#)xDMY|Y8;vtcT5!$9veAs-q!t)7xPDPTjR`z3J#tGa>OCltVEtK;+Vxd8!
zyR9s2pp0nkpIUuabH*t5h7U^n!+;ZO%V=1?``;DASXyBF_0JU+j!>WHCPmMK>s(XG
z(LA|L9%Nh_{m^q<I4E3NQu6|1VIcx_s(}--0?<|%%>=OyviOF-DO4O%RfT=LAPkH>
zBHg98>-rCTzH8Y%%gBVYDXhaviT@9Qv|ZY|gN5^)6{K$OWFmh!j7q}0caaidJ~}Be
zw&Al9B-4l2K*^qCvB^mGCcPeXgQ9*wk;e0S`#dvV46b&4(yy07(*bfouLJ#RYFL1R
zn*JG1_^pHw*Gp0*i%dj2-YX{MfsZVd`{f#cSdd=0L^x4VCaaSS3~CuD3NAh8qBnJK
zMo`I0PaOmPxeNE9%&5=fA1Pgxu>~_uiyBRl?-X>iZd$Iq%|av!)Ha*eN-hh=-D78%
z`ADQEVexzU=YxMy5CO`NZ9+%<ny68DRH>QL98g5)D?%G+U8RWF7LN>MfnSQww5Cy_
zv5G3(4D-Jap>gJ&|HRegcJ>2V!jeO0^ZTE%(99J^552ZP#SWMs372+7B>c|LsL)i;
z+RDOIK?KUfVCoRFhl*46_MBUL7{^=FE8l3TAhHu|#gi9hw5_gA77Mze4&G9>Cgz!z
zVYw5Nw^caKZQNRK_ZqXeCNU|E{dhEAYW0wEdSK8Cy^*!kTQtvdKA%n6sDKfVcX{|R
z;*xc1`GC|9Rn-VOtyR6K7sp(tvW?Y=CRA(1pXSA@wt_~Vm-z*8?VMB8V`xGvEgWD=
zUW$ZuMOU=xZ7YY5c{A@6U^4Qle~1TO<q$&S-)rIQzu)T%vcV;EB6ePX^Ei7o;3l@F
zy4%38aEg52?Bd?nl+eGHX(gw}`AkQty-`1N8h)D}r3BkRx!|q^+UD5@xDkR+5fFEY
z3O9mVB~wJFpl&?_Ca9faS7mzNi2LoiGDiaUwow15Muls47kj7I&*NI7$j^SKb-!!G
z2YJ|z{d>xn+1bQNC;Dl@#{7C!EU#>=vm)OQ>G6akY7qtYl3RMk5(gYkHaOLuE<al>
zEcOC5>Elv8ZDp4i+I;z=QROJ<x}E>a%T5;8_QZYC#uku|QisoQ>c~4B+s{Y054xJ;
z)QqDa=PHhux_JMZS)1;fSb)yZJ2gJ$vKkV=##ooC*+$Z6EM6a0%u0_@wK~x+q|LzK
z)Gwr-AvxPN8pX&4rAf)idJ4#`G0Pa|N{w(7sNCt4<<(N+lXnLL`=l;Im2?)Y?RK&9
z^J^rGonX(`@kc-Qe<To#Gg`nT<cIHnI1A)HX1{34-zROn?njuL+0Q3B2*tFfv}BYE
zQ-kQ~rsZGPfp}%tLq@XRgo0vMr}4Rk?)vF127OlwCjL8<nQyY5xVWsc_W)?%*=Ncq
zcod@G<;cdL0)~H+-S#$LD|8y%%lxrfBPmoec;BW%pkjNB|KR>q|Fp;C^I%4%6K6(|
zm2k0c?=HoS*FqNNp>`g8+Q*q4baWPAqKc+1*V5i>y{xFq{Id1dPY!T~rn$=qBZ$}K
zY8bvTjl$s-;?qCv982bUj<GpWlBN)p1Aj4CP8aG(OiXXaUK-cUuyH>{c5jT3zWQ4+
z=#AgK^QF(Lb5dSNp`pdVzBhs9$KP_zww3fqrrCk7W`0PB`hUmS3}jhwEC=xtpx<vf
zWV%1dRcDb8724fily;v#mm{DA2|BEH-Tu;(&2h;u;8+jZr6$du5)oVTN|zDT`pRNY
zbE1#I--$U7+OG~DE9E+lB=#=dn;;e-1cL>tR&Qs@6#A7R#Y{5F{X_5VJx+jNyNoR%
zo)4;(uf^ikUNG)^#meI8TBm}4xS{^2FZy$Rhz4t(?T!oAjI!#w)A~MJZ#z?+D_5|b
z!44g3tMNA7c#Tfn6Jw&`%7bMTn*R8xMkV3{S4?vcc!I=?58!m1@-iT%2;ihz)#n$}
z^;{I&wHo-hFB7lqkzM=kJ(UA?@{-bzf?X%T^z|Fe+Ax6ccMCH4%b-IM4|?+~IN0gY
z{;_5^IogSD@+5QEzP7ONl)7bRywB1IGS$PL@cZvRUrd(*$9IvAQfEa}u$&!{o@VQv
z(%}c6_fs62tA<UBc;K5^JC;pP?#FeU;TsQyF;|=^Z8jj6fFMK{0`f~4ZZ?~G@ceZn
zhO5xYm|<n1Yu}uhGj&@-|9(P8O&G~En{cKa2^yVAc^dd0lE!ABQgW_Oj1ClG;|3{B
zZ)G84<^|ZEK_388f+SF_Ju|6uZ27{#%R)#R+lfkv0|)wY4U}wd=#6%5wFm|UkhbX9
z(vR|E2aY|gyK6ND+&Gpo!aKkBg$Ww{UrGz<wk0y7Iby^jXq(vTi}0Wmd8<4Az+kQX
zD4!3zq78C?W8G)TX#)#d)40lBuuyGN_pil$MN;gnn6D`%7o)s~-s3Ka>mA}2uFUi4
z?+Ib|z}Fl(gTQk_99c;uWCm*pIl6m#>Dnahg^5W<k`v5Si><s3Ur3<kL*u0v;T?((
zxT`ub>10|HpYP+6s31FLD+-{qk-C7L^mDe91&ttUXuGCX^E|vY>k$Ue?HxR-xsD{R
zPmNPx-(LEM^6_i`NVK-PR-r}y8aPxfG-Obaa*gL5BM_}U?Yt7S?K$QtEksYdMCW=X
zjdO0jMQ0{gWy{5kE&ULYtO80pnB0vO!Mb|?doq^Z0q$I2&mkVV_(Bwv^Md<l<lAA5
zzyZvsuNo<;)ZA@AgHKe}=?J$msYUQ7j62h>htn75sNs9&(N62V($bJ`)(g=^Y;7);
zi&)#HFA4o~!&VOzNs#*S{fhPazQ02rL)UY;7;S%<{2mWu{Mq`J-eZrSAagNGv26~V
z<-rl_dbhgz3SUfG^R1m&uNRF#Sy6@5{VPS^Dt=b>qz}-$bsg(m9%|_yDv0U$W`ACN
zZW!$N8+G?IK9s4wAk`)7mde1sRloWR&d+nU$(MXVyJ@jCoo33dYVR!t*l07hcZ+k|
zbMdN3G07rZqV49WK$>yoLx7$?)YE-rVXQkS&}%z$PaxD}hdpJDwe^C*Qpq~`sCED4
zew&b66lq8W<6ZHNa{+^*ml-k7f=MzY2(sYgOH{PYF^`^pg*|r!(9nD(MM~GPDrrfs
zLWr9;cA|22{W7K%NJ%X;dci7xYyIqZ?&i_g+}`Wd4$+#9ny_Bp6`om`rQ^JI+EV$@
z!pUUib&8}?4&hf6^M}>RHJuj^;H|xlRoD~lDBjK;S84?urQ@lv1+CSKmUM0-x8UC3
zI#faUMbMY{Z#g76GuYiN<Sgk*CsXnju-$uhM<kg$`A9y_frhN(is=0Q2jgmia|o_#
z-OGqryx{Kh03tNa&<+5HCmBNJ-x<yM1T@!t_$uBfx}6&6L3K4>3#J=WbZ`#SlNmUt
zl-n5>*{Z4_7w3N+h`k;(vULk>5+{>wNA(@LN3&%*KCm5;Y4_329w*+<ts(Ic!j1J=
zqy3HXl?K1Mh|b0LtXLR4-pfU-`^ah|UG+cTZCuQmrPy?6!^@$vLJVFiZ8$b}@7B%t
z(-3q{A={`7k%a2^5jFSKLbofKQR9zig^Xm$ZI}o1^STc*?@KCg98UP<q8&R!P`wZC
zN=QiP@nhA0Ua_v=s_-kP;?E?3c4*xlv{vD#iTj+Z?GlH3B#{?y9J)%cJ<;Q5UO`GR
zYrA3^Qc_XBeqz@vPg~u@)cbl?8&hUqskMX2C(8acm;YFy@|CfjPBa3T=yu_Z;l0iG
z*Ij%@f_xiHitDK+cMC|1`GT&$qIyjCv3j<n@`DYl<iIfDP#5esPre{EPF{HSeOcEQ
zP`M4WWV(<39z~0^n3lF0WBbYY!3O>!uIC~&iJ$N@tE^x1rjxD>MZ^T*zI;1^b;}N1
zSC!+OFriR%q|fY6pUY7lQ{ArYxJ2MWSzHg}Zs1h21@ohUu^$e+VE`1Ep9f3$7gx)h
zl9zHkqPiAa`+O{}nyQqHJL+=riA8Gwea;}(i!a3^cSK1SWkz~(1u$-!%fueN&gG)L
z=|=;D9al{Dux8@gMAvUfXQbGW&Cv;De`(=vQ5Bjq-$O0zdA_?qA2<-S5oce&a71`k
zz9=ePuuJ*^U<8u`QSWV`vu5a2-V{XhKmAv>w+`xV9bd;W(?orjR1<mJC5LIWUFp;H
zcA&ImqpWx-l3#25mfgC<jOsM6>xoz$6)+57O2=CAfq}ftA3F=;AN0hI0$)BHSPe;P
zUo>0((z*C<^r<JM^4NG1*_=t!IqASQI_$7Nqo##7<&xvH5oMSddDGCN*_68HxC}kk
zdAhzw&aoHNHs~zvOirA@ImDlp&8hgXFhau}dV#)k*uNZ?sm1R<<h)UM)6u1Wu(|`~
z)6uDOy{qNerbB<`c`B+^F<wrwxyy@FrhOHJDNMa-*bWg5cYPzO()`$j0}aeS#ae&K
z==G+jiblQj@2rNMYx3uiBfJv1Zun@CdfAe}@4yYse9Ow~!i~Nqzv}aD7U5@gDz`~|
zI|sZJ8g<v0JqX=iZ?<MP^^IbsV7!mCwgn`|xlH7J?0+6*G0xQQcR;eJ0DWj2uP_)f
z_t{5nB)Olh?e5<0v4`WWlXktuC+VHXZE<0asMYiGmRds#SMAPKpZrjblxq8HS;9BL
z=FceE#h85rEOwcXLiK`xY+clpyf|N?6cr6S^z0padk4+OKU<g*XfaFO={YSyBd^Ko
z+~5es>ajlZo6eCqfE<3a!e8}wG|ms5!59@Nr)7mL9CCU}H(4e9{KvD-<AW31$_}Ye
zg{6!EMmBY*t|qq`JWtqnPc0+4zIrnjdgo6ysPiv#_k#rH%vZ}{LmlL`FNAY2k1Y50
zt>xzQuIzN7;SMd7H1}<%4zLdK>dGK&Kwz;7!;B*Pj30X6-mR%ij#0Awkm{Y?lgyl7
zNwfyt`cuU>8G5H<_KyqDQvIvhyQsIgss$5fZiBU|yM`9=*lR+)BQ!*n@5yhY?b`$o
zIgo=l=7|dVs|em$7&UHpTW0yv4*PXW$#XnL3^}^Pnfx~pm#=uz@5c}p6@dBqr00h|
zXmzNKzNEQ?u?a*RO0*i|2z}R+uKN@^n@NVZ)%vQM5rUYX?hvH4B+xC~M#+By(`oCe
zb+&!nesCN;yv(tZv;)XJw|qbfR_vS>Yqxg)NLr~N(AN0gVQE2>xQMsXOO=VN#*KWA
zm;YY>odwe5BL{{Nlw9zD{Xpm&_pj{G776%0oPS@AgpXv<wQ8^=8hYr(;)K6Y_(coo
zVr`GDvX<?7Pct{Vomk2)hC&EDr?-Hxk&(E2Uz`Hql}R7(_W7!Ow=ZbP=^Shv%f^j7
z{kP)Ou*?nBQQ>cAL%xq`2UPEsF1Zx?dD7)Fmhadm=XcbAR~f}>1g(Ll(fMXCIKu)l
zKi-sCLL}lxd$GhEDV`%78ZzQZn_&Y-o_`v$(nz1Y*tRSkj??tNi$b~tiBM;9qV1G_
z1%(v!MSR#pC31F)ja^yVI;9g;sC=F+ylwYy29F=tC%k>&tyF+RgoXau4-NWF&4JQS
z_r<Ufi|ezNm(tYuY|znLn7w!q@pLCz%}s9Q1Enw}2KL39aLE2uzXAjhgL?A8bt2ck
zLt8qR3WhwvJ$<MqRQ)F&bYGh9Aeoro*vLz<A#7C4uo|@xix<gD^^BH?W$2rY73K32
zDS9`v`}+=I(r%X?0eOgD*3YRYTQ~bC`Ob=m&-g^SKRslH?dn;auJ1=Gjm2@o$0roP
zNoT*!JpezCj@6mQ=Xw43_d~EYC=KW#XG)@0iDbA$#fdio1>X0<-z)N_H6LejGu&u7
z$OXtzppkRn)U?L;FYJDKqFGp8ialm?67nV$&3RmJ${T}ZZ{Jq7?nKTyO!Q^cZ{aAX
z+ZPkEX1+1uO5w4(wwT%{!E$n){yS71$+zwPU1hPA5xA?*S#=8H6k_qn(|&IIKrU7J
zKx7`H0n8W0<q$Zp;C_AKu*0x-ddHvON`^@PcvH-+r4UA+M{ZhzEQ0T<t1@DA$DH?a
zfDgJETMJJbjXyxefOtsY51>*%>RyQ3Qrc!%+553a0=-YlFtq~&y*XymAeN{}y!Y&v
zP`H)a`+oyb-RBEjh@wFQ?94D_bKVC*4oOFM3zUlyb(JjWsBJTqsI4q*6Ew#{3(v+Q
z-*vxIMgy#btwhsit8d$#_wS&SHlbxPPx=W%**EY~UUgDNiEGoA4tPY@_B>U4sg+#@
z;mHU`NS)tHSlxPzt8ZkM9QFrK{e8GyU&(WI{yM|vY5iCI(qH6X$ire3RAMK_hsh&R
zOm*t@TCYo4ii&GPoIRQn!X+LsYFaL0Wc8Hc>ks?206#N&tAjH{GS9&U)dC2MyLJt;
z86DX3IZm$;j#HjkCy-?@Bfyg5-&L@NhjJ4=YXP~ne$`)r9#a&4bn+q`4}#3?`M++W
zD{|efO%688mY?hD#>9|Fxe8fM{4hd=?;VJNN&&azrx$bIVWW7>oNrrCcx9|fY;pc@
zWukeTZy2^clBFe~jtTj8R;&`C7N_T;m+e2T@G&36xU99OzU5f0^F&f0VelvQaXB8O
z0W(;EEtppQ4VSERggPyc>%cBKz482^e*`dLW#{K{cv;2ik6+k(3W7B!<Q7qslI`gg
z6058<W6iPj4i#cWGIuvx-ghqK1vA~t%pg)5&Gle(PpFcOJ@IqTfXp|(wvq1Xonq+{
zXw0ymA_H3o2P6&3&hYhSPU8ElncbT4pzW?JY9R=PbxU;bkCRHQ@<L-`b_<}MEZ{1+
zTmwkwTTne5P7F1dvE!PWb3|o82$>-+&oyJs{FiYEQll2L2%8_aPKBR3w4h#htoSw<
z)|F*>eIyVqvMn}Zr=kgeex50mJ$g8>nyqI5osIPw^r0Qai=VZs5iDDC^&^hpys)~5
z1k&>^To0nbw=V~LcF14ULj}yZSlz_kMRHo;6%%fo`H)yQ{gdJ1Mop%qZ-y6MGJWWT
zNg(ROD=J?U@Y*>2{6aEhRJYotIO3dRwHa_OksA0W)5rgIK+<DN__G$x*{I!s{aoi(
zxkHGitt4(1TU@=Hjk68GkGL4ZdWHYND_18q^m=jW3sq|2b|t^Q3TPg84V!7^A!7m}
z87=1%?p56V1OMb_j-snGsp*_eg`J*QH#T#K4y)QaC6m|7)a5W(@8C#W$U4q#Rtc0R
zEle$y5*OYh86VIANhX$0?Vz*lJ;JN)om$f6|I)EX9NsqHeHQGBvAb@S-(E+#O3iTx
za1f*{=Ch!=y6!9i`x)i(Ko6n%h*@SIJ8NJ#g}9oafkgT<lw5n{dixxy1qb9YboOLs
zIfaSZ_~SN1^-#~dl#WktN}gr{C&hDpa}E)R$LYQBJ7&v*3z6)5_bz;C;Y%znLGdl!
z+H+Oi6k2fwjx#j#Tu25&sbEm1M7JGBq)WSQVk@Aj<hz-+k=;<IdLP2}uY>Wxb(f=)
zXityT{l<lAl+5V1SM#@$)mCTi1zd_2Rxfkp!ycF0@CY{7_KCe?wH%p3baL-W_dV#X
zDz)zEsOs|}Y-;>Wkr!EgW`}F9wAx@3)?Q&b=-9=*Sd^waJDam{+R|?-eBc41i;s}j
zJ@n;!z4qU_-O9-!kBQ}DUOT5dS4R!Zb#MU_`4ZAQs3F{=2MV|#6LA8YlUP~2K)MPy
zzbTXd+OOLiety>^Ipnb|0BP$GWSyO56<*u+_BjRGJ3;fu3{<CUr&EpfuO}pZb&C@p
zUd_Uf5YX&S-keU>3SH1!eA5{oDs;cYD}q8il|J}KgXZ!YwF<GEFobk-iYz+4mrJPy
z=n1<((fwpYqS7NRxsbOAf-$rpN(vQ<<2SfT5z2B?s9HoGmBW26B&;UfRYi;(-(?xh
z+#w&92&%{9!T|A|QyndQRjYg~^kOVNQ`d8^-2HE3YUyl(x2qxtwm`I><9T~Rz0Nr3
zxfDe8xcP0FtUdjV6~$nM`z1=A$Iy0B8ZDIiQJ~A3F-NBKr;^TmsYMx?@lM-brS`Jt
zx)Pz!xGA~uB)1nh>IL9<<>s}QIFSLoad~8zFn{P1yRCFlww!udH)cZ_T%K<(RIEfX
zbj}l%M@=-$oL-k8LU~rS(8EqPWh-c)#s9zbhg)8AU{49I<#x6zt(X<o=}Oc-mO*2w
zp6LbG*dcFyZum)k9Zfv5dCcjabuMmw;ON?{zOUNEh5uKC3atJ4FA`vk-XPEN7+{}{
z1D|HTvO<OKL~azSmCe3#_YcO@LKaI&4-?vjrY7Ya6BYW;5+CL*TjYln)squdNF+Yg
zEfzl(e)Qq$F7mS%QTQ~TA{P}QVZ+WMIeFoV4Tb7-C4}E=ux9Ijh^Xf~Pj7gl3#k^{
zv%)DL7Fu*66h_X7-WX`><z{XaWzY2+!vS!MWqYC?UkeRru!X9reGCv%X_ji=XCT^-
zdnXC$7mi1W8~6%e|1~htGtPLZ`$ha%_{ryb@b(j2#&Jco(b%TKH&n~Ndn^wAZ{E4g
zXD)m!&kq|gb)2BJ81XgKG&w}F3ptw=hOjc#7oziycN(JHU!VKTJz3*jo$RSfQyy8(
zXi}^ti}lD`KhRH>lKCdnec;X+u8xz#9elIx%=9E`W1;nkYeUutqDf*>0nb2Plav|T
z9ASnpAL=%X*E8*Fk)cZG!$)lz2Yz55+(GidYl&=!ocgHTk<tXWMvOLH9QZz4koi(!
zM{EYWnx7m6h{uH}eHhR$vZXTX9m0L|wHxX1b}pu4SASn@TfM%^K=xr8_iW$<xXD!9
z^Lf}d+CpT`wNm;eVrF{zk?)?hO9&O~IoRG}uzCZ^y~O-f1x0$zWn5Ax^oz>Q;>CI_
zZGCV5ogGt=&?iIJ`srbY)B#BrmT-xKIqEUTigC9%X2yIVSEK7nKK7Ys?wf?|v(muF
z3sEjUI!76R@Q&+ASIN(hhN4B=4^})Mb{>h%m9RtGuP)bhFYxBC<#fF`^ar8dcJ93o
zw0Ejxd9UfwG$>^>_fL&G5t1?`W{OPxz@yrbQM+;J5i$q*IH7g0`6KtR(TnZ+@ux3N
z$0x}iXY^)}P%(`kyS;k#Dyo5pqmEj>#lpcN?1#(<HK%H~Pp~@c-J>0C%SD~2mwm|7
ze-aFTZX4CPTPN<Y&)FD(8rQodw_E!jz3$t-`!?sOZrvW0z{t9Qu=+<dELxZT??X#W
zMi&_3nIB-7So3SUJc7Z(k)sblImhM(RnFXiDTb%hDRa7Ay~T$I`v8s~F<q|xXFw__
zp|fDroOx~b>A1RH8P13gw}T2ttiPGG?c1Kl`-qI~`7ilQOkKKDSFuTEOoKzS&J26?
z$bn%=_c~G({&T!;>C!YkN>!26N{y6c()vFeEdPze=Eh9<|Aw$T|9MUSFKFWTuSr;L
ar9i_1b4z4gZ{50e>#>%;CI$=*`Tqbn4+RMT


From bd3d08db3bbc6914cba55db5db87b31b8321fbc3 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 13:00:23 -0700
Subject: [PATCH 23/35] prepend Interface with High Fidelity in setup options

---
 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 f268feab37..f92e69c511 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -387,7 +387,7 @@ Function PostInstallOptionsPage
   StrCpy $OffsetUnits u
 
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
-    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_SHORTCUT_NAME@"
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for High Fidelity @INTERFACE_SHORTCUT_NAME@"
     Pop $DesktopClientCheckbox
     IntOp $CurrentOffset $CurrentOffset + 15
 

From 02d93e2a1124cf61a25dd7d903ae2f1f3f209e4c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 13:09:36 -0700
Subject: [PATCH 24/35] cleanup fixes for old shortcuts in NSIS script

---
 cmake/macros/SetPackagingParameters.cmake |  7 ++++++
 cmake/templates/CPackProperties.cmake.in  |  4 ++++
 cmake/templates/NSIS.template.in          | 26 ++++++++++++-----------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index cdbddf84e5..ef885df09e 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -90,6 +90,13 @@ macro(SET_PACKAGING_PARAMETERS)
       set(INTERFACE_SHORTCUT_NAME "Interface - ${BUILD_VERSION}")
       set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}")
     endif ()
+
+    set(INTERFACE_HF_SHORTCUT_NAME "High Fidelity ${INTERFACE_SHORTCUT_NAME}")
+    set(CONSOLE_HF_SHORTCUT_NAME "High Fidelity ${CONSOLE_SHORTCUT_NAME}")
+
+    set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "High Fidelity")
+    set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "Server Console")
+
     # check if we need to find signtool
     if (PRODUCTION_BUILD OR PR_BUILD)
       find_program(SIGNTOOL_EXECUTABLE signtool PATHS "C:/Program Files (x86)/Windows Kits/8.1" PATH_SUFFIXES "bin/x64")
diff --git a/cmake/templates/CPackProperties.cmake.in b/cmake/templates/CPackProperties.cmake.in
index 164e432706..d22ba1f5e1 100644
--- a/cmake/templates/CPackProperties.cmake.in
+++ b/cmake/templates/CPackProperties.cmake.in
@@ -10,10 +10,14 @@
 #
 
 set(INTERFACE_SHORTCUT_NAME "@INTERFACE_SHORTCUT_NAME@")
+set(INTERFACE_HF_SHORTCUT_NAME "@INTERFACE_HF_SHORTCUT_NAME@")
 set(INTERFACE_WIN_EXEC_NAME "@INTERFACE_EXEC_PREFIX@.exe")
 set(CONSOLE_INSTALL_SUBDIR "@CONSOLE_INSTALL_DIR@")
 set(CONSOLE_SHORTCUT_NAME "@CONSOLE_SHORTCUT_NAME@")
+set(CONSOLE_HF_SHORTCUT_NAME "@CONSOLE_HF_SHORTCUT_NAME@")
 set(CONSOLE_WIN_EXEC_NAME "@CONSOLE_EXEC_NAME@")
+set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@")
+set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@")
 set(DS_EXEC_NAME "@DS_EXEC_NAME@")
 set(AC_EXEC_NAME "@AC_EXEC_NAME@")
 set(HIGH_FIDELITY_PROTOCOL "@HIGH_FIDELITY_PROTOCOL@")
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index f92e69c511..8c494620e5 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -416,7 +416,7 @@ Function PostInstallOptionsPage
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ after install"
   ${Else}
-    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity after install"
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @INTERFACE_SHORTCUT_NAME@ after install"
   ${EndIf}
 
   Pop $LaunchNowCheckbox
@@ -485,7 +485,7 @@ Function HandlePostInstallOptions
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ; check if the user asked for a desktop shortcut to High Fidelity
     ${If} $DesktopClientState == ${BST_CHECKED}
-      CreateShortCut "$DESKTOP\High Fidelity @INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
+      CreateShortCut "$DESKTOP\@INTERFACE_DESKTOP_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
       !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES
     ${Else}
       !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO
@@ -496,7 +496,7 @@ Function HandlePostInstallOptions
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
     ; check if the user asked for a desktop shortcut to Sandbox
     ${If} $DesktopServerState == ${BST_CHECKED}
-      CreateShortCut "$DESKTOP\High Fidelity @CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
+      CreateShortCut "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
       !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
     ${Else}
       !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
@@ -506,11 +506,11 @@ Function HandlePostInstallOptions
     ${If} $ServerStartupState == ${BST_CHECKED}
       ; in case we added a shortcut in the global context, pull that now
       SetShellVarContext all
-      Delete "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk"
+      Delete "$SMSTARTUP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
 
       ; make a startup shortcut in this user's current context
       SetShellVarContext current
-      CreateShortCut "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
+      CreateShortCut "$SMSTARTUP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
 
       ; reset the shell var context back
       SetShellVarContext all
@@ -591,14 +591,16 @@ Section "-Core installation"
 
   ; Delete old desktop shortcuts before they were renamed during Sandbox rename
   Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk"
-  Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk"
+  Delete "$DESKTOP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
 
   ; Delete old Start Menu shortcuts before Sandbox rename
-  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\High Fidelity.lnk"
-  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Server Console.lnk"
+  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk"
+  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
 
   ; Delete old startup item for Server Console before Sandbox rename
-  Delete "$SMSTARTUP\Server Console.lnk"
+  SetShellVarContext current
+  Delete "$SMSTARTUP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
+  SetShellVarContext all
 
   ; Rename the incorrectly cased Raleway font
   Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml"
@@ -880,12 +882,12 @@ Section "Uninstall"
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
   Delete "$SMPROGRAMS\$MUI_TEMP\@INTERFACE_SHORTCUT_NAME@.lnk"
   Delete "$SMPROGRAMS\$MUI_TEMP\@CONSOLE_SHORTCUT_NAME@.lnk"
-  Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk"
-  Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk"
+  Delete "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk"
+  Delete "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk"
 
   ; if it exists, delete the startup shortcut for the current user
   SetShellVarContext current
-  Delete "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk"
+  Delete "$SMSTARTUP\@CONSOLE_HF_SHORTCUT_NAME@.lnk"
   SetShellVarContext all
 
 @CPACK_NSIS_DELETE_ICONS@

From 8be3931bbf6039e14b4d4b852659b8b44a366966 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 13:20:31 -0700
Subject: [PATCH 25/35] repair shortcut name for desktop interface

---
 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 8c494620e5..e7ea3dfb2b 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -485,7 +485,7 @@ Function HandlePostInstallOptions
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ; check if the user asked for a desktop shortcut to High Fidelity
     ${If} $DesktopClientState == ${BST_CHECKED}
-      CreateShortCut "$DESKTOP\@INTERFACE_DESKTOP_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
+      CreateShortCut "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
       !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES
     ${Else}
       !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO
@@ -590,7 +590,7 @@ Section "-Core installation"
   Delete "$INSTDIR\xinput1_3.dll"
 
   ; Delete old desktop shortcuts before they were renamed during Sandbox rename
-  Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk"
+  Delete "$DESKTOP\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk"
   Delete "$DESKTOP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
 
   ; Delete old Start Menu shortcuts before Sandbox rename

From 53c16280bdfe24d9e71181baa7a438156fecfca1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 13:22:57 -0700
Subject: [PATCH 26/35] remove code for stack manager migration

---
 server-console/src/main.js | 141 -------------------------------------
 1 file changed, 141 deletions(-)

diff --git a/server-console/src/main.js b/server-console/src/main.js
index b36d798a30..7183edfc25 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -347,134 +347,6 @@ function goHomeClicked() {
     }
 }
 
-function stackManagerBasePath() {
-    var dataPath = 'High Fidelity/Stack Manager/resources';
-
-    if (process.platform == "win32") {
-        return path.resolve(osHomeDir(), 'AppData/Local', dataPath);
-    } else if (process.platform == "darwin") {
-        return path.resolve(osHomeDir(), 'Library/Application Support', dataPath);
-    } else {
-        return ""
-    }
-}
-
-function isStackManagerContentPresent() {
-    var modelsPath = path.resolve(stackManagerBasePath(), 'models.json.gz');
-
-    try {
-        var stats = fs.lstatSync(modelsPath);
-
-        if (stats.isFile()) {
-            console.log("Stack Manager entities file discovered at " + modelsPath)
-            // we found a content file
-            return true;
-        }
-    } catch (e) {
-        console.log("Stack Manager entities file not found at " + modelsPath);
-    }
-}
-
-function promptToMigrateContent() {
-    dialog.showMessageBox({
-        type: 'question',
-        buttons: ['Yes', 'No'],
-        title: 'Migrate Content',
-        message: 'Are you sure?\n\nThis will stop your home server and replace everything in your home with your content from Stack Manager.'
-    }, function(index) {
-        if (index == 0) {
-            if (homeServer.state != ProcessGroupStates.STOPPED) {
-                var stopThenMigrateCallback = function(processGroup) {
-                    if (isShuttingDown) {
-                        homeServer.removeListener('state-update', stopThenMigrateCallback);
-                    } else if (processGroup.state == ProcessGroupStates.STOPPED) {
-                        performContentMigration();
-
-                        homeServer.removeListener('state-update', stopThenMigrateCallback);
-                    }
-                };
-
-                homeServer.on('state-update', stopThenMigrateCallback);
-                homeServer.stop();
-
-            } else {
-                performContentMigration();
-            }
-        }
-    });
-}
-
-function performContentMigration() {
-    // check if there is a models file to migrate
-    var modelsPath = path.resolve(stackManagerBasePath(), 'models.json.gz');
-
-    try {
-        var stats = fs.lstatSync(modelsPath);
-    } catch (e) {
-        // no entities file
-        dialog.showMessageBox({
-            type: 'info',
-            buttons: ['OK'],
-            title: 'Models File Not Found',
-            message: 'There is no models file at ' + modelsPath + '\n\nStack Manager content migration can not proceed.'
-        }, null);
-
-        return;
-    }
-
-    function showMigrationCompletionDialog(copyError) {
-        if (!copyError) {
-            // show message for successful migration
-            dialog.showMessageBox({
-                type: 'info',
-                buttons: ['OK'],
-                title: 'Migration Complete',
-                message: 'Your Stack Manager content has been migrated.\n\nYour home server will now be restarted.'
-            }, null);
-        } else {
-            // show error message for copy fail
-            dialog.showMessageBox({
-                type: 'info',
-                buttons: ['OK'],
-                title: 'Migration Failed',
-                message: 'There was an error copying your Stack Manager content: ' + copyError + '\n\nPlease try again.'
-            }, null);
-        }
-    }
-
-    // we have a models file, try and copy it
-    var newModelsPath = path.resolve(getAssignmentClientResourcesDirectory(), 'entities/models.json.gz')
-    console.log("Copying Stack Manager entity file from " + modelsPath + " to " + newModelsPath);
-
-    try {
-        fs.copySync(modelsPath, newModelsPath);
-
-        // check if there are any assets to copy
-        var oldAssetsPath = path.resolve(stackManagerBasePath(), 'assets');
-
-        var assets = fs.readdirSync(oldAssetsPath);
-
-        if (assets.length > 0) {
-            // assume this means the directory is not empty
-            // and that we should copy it
-            var newAssetsPath = path.resolve(getAssignmentClientResourcesDirectory(), 'assets');
-
-            console.log("Copying Stack Manager assets from " + oldAssetsPath + " to " + newAssetsPath);
-
-            // attempt to copy the assets folder
-            fs.copySync(oldAssetsPath, newAssetsPath, {
-                preserveTimestamps: true
-            });
-        }
-
-        showMigrationCompletionDialog(null);
-    } catch (error) {
-        showMigrationCompletionDialog(error);
-    }
-
-    homeServer.start();
-}
-
 var logWindow = null;
 
 var labels = {
@@ -530,12 +402,6 @@ var labels = {
             shell.openExternal('http://localhost:40100/settings/?action=share')
         }
     },
-    migrateContent: {
-        label: 'Migrate Stack Manager Content',
-        click: function() {
-            promptToMigrateContent();
-        }
-    },
     shuttingDown: {
         label: "Shutting down...",
         enabled: false
@@ -569,13 +435,6 @@ function buildMenuArray(serverState) {
         menuArray.push(labels.share);
         menuArray.push(separator);
         menuArray.push(labels.quit);
-
-        var foundStackManagerContent = isStackManagerContentPresent();
-        if (foundStackManagerContent) {
-            // add a separator and the stack manager content migration option
-            menuArray.splice(menuArray.length - 1, 0, labels.migrateContent, separator);
-        }
-
     }
 
 

From 7c0c48458e0f3a30aa4e12d55836d50a712036a4 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 13:25:47 -0700
Subject: [PATCH 27/35] remove padding from stack manager migration block

---
 server-console/src/splash.css | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/server-console/src/splash.css b/server-console/src/splash.css
index bd3a06cbe3..0782cf5314 100644
--- a/server-console/src/splash.css
+++ b/server-console/src/splash.css
@@ -125,10 +125,6 @@ h2 {
     border-bottom: 2px solid #F5F6F6;
 }
 
-#existing-resources-area {
-    padding-top: 20px;
-}
-
 .footer {
     padding-top: 34px;
 }
@@ -143,4 +139,4 @@ h2 {
 input[type="checkbox"] {
     -webkit-transform: scale(1.4);
     display: inline-block;
-}
\ No newline at end of file
+}

From c2c7ae89db0dd5429925319a78a68fdadd69f032 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 13:27:44 -0700
Subject: [PATCH 28/35] remove bottom section from server-console splash

---
 server-console/src/main.js    | 2 +-
 server-console/src/splash.css | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/server-console/src/main.js b/server-console/src/main.js
index 7183edfc25..26ec2dd536 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -583,7 +583,7 @@ function maybeShowSplash() {
         var window = new BrowserWindow({
             icon: appIcon,
             width: 1600 * zoomFactor,
-            height: 737 * zoomFactor,
+            height: 650 * zoomFactor,
             center: true,
             frame: true,
             useContentSize: true,
diff --git a/server-console/src/splash.css b/server-console/src/splash.css
index 0782cf5314..5a911e3872 100644
--- a/server-console/src/splash.css
+++ b/server-console/src/splash.css
@@ -122,7 +122,6 @@ h2 {
 
 #main-content {
     height: 350px;
-    border-bottom: 2px solid #F5F6F6;
 }
 
 .footer {

From 0a8072164d654599d3a6b0626f1912f7514711b2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 13:44:16 -0700
Subject: [PATCH 29/35] be less redundant in prompt for running applications

---
 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 e7ea3dfb2b..28cb20dd1c 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -737,8 +737,8 @@ SectionEnd
 !macroend
 
 !macro CheckForRunningApplications action prompter
-  !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "High Fidelity Interface" ${action} ${prompter}
-  !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "High Fidelity Sandbox" ${action} ${prompter}
+  !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "@CONSOLE_SHORTCUT_NAME@" ${action} ${prompter}
+  !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "@INTERFACE_SHORTCUT_NAME@" ${action} ${prompter}
   !insertmacro PromptForRunningApplication "@DS_EXEC_NAME@" "Domain Server" ${action} ${prompter}
   !insertmacro PromptForRunningApplication "@AC_EXEC_NAME@" "Assignment Client" ${action} ${prompter}
 !macroend

From 7d042fc47de5eff20329eeb64298e3ace470bb2d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 13:54:55 -0700
Subject: [PATCH 30/35] keep server-console as sandbox folder in Program Files

---
 cmake/macros/SetPackagingParameters.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index ef885df09e..63e7a1a174 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -64,7 +64,7 @@ macro(SET_PACKAGING_PARAMETERS)
     set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns")
   else ()
     if (WIN32)
-      set(CONSOLE_INSTALL_DIR "sandbox")
+      set(CONSOLE_INSTALL_DIR "server-console")
     else ()
       set(CONSOLE_INSTALL_DIR ".")
     endif ()

From f29647b5191214f440a13cc857c0efc1e31c1273 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 13:56:57 -0700
Subject: [PATCH 31/35] use HF shortcuts for setup options

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

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 28cb20dd1c..0e30d8aa2a 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -387,7 +387,7 @@ Function PostInstallOptionsPage
   StrCpy $OffsetUnits u
 
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
-    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for High Fidelity @INTERFACE_SHORTCUT_NAME@"
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_HF_SHORTCUT_NAME@"
     Pop $DesktopClientCheckbox
     IntOp $CurrentOffset $CurrentOffset + 15
 
@@ -396,7 +396,7 @@ Function PostInstallOptionsPage
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
-    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for High Fidelity @CONSOLE_SHORTCUT_NAME@"
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @CONSOLE_HF_SHORTCUT_NAME@"
     Pop $DesktopServerCheckbox
 
     ; set the checkbox state depending on what is present in the registry
@@ -404,7 +404,7 @@ Function PostInstallOptionsPage
 
     IntOp $CurrentOffset $CurrentOffset + 15
 
-    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ on startup"
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ on startup"
     Pop $ServerStartupCheckbox
 
     ; set the checkbox state depending on what is present in the registry
@@ -414,9 +414,9 @@ Function PostInstallOptionsPage
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
-    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ after install"
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ after install"
   ${Else}
-    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @INTERFACE_SHORTCUT_NAME@ after install"
+    ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @INTERFACE_HF_SHORTCUT_NAME@ after install"
   ${EndIf}
 
   Pop $LaunchNowCheckbox

From 103257493c801ecd9715e5950a49bfe76df754f9 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Wed, 30 Mar 2016 14:24:28 -0700
Subject: [PATCH 32/35] Model: fix for crash when displaying collision mesh.

This was due to a default constructed PayloadPointer being sent to the scene via resetItem.

The fix is to A) not do that anymore, B) make resetItem more robust and not crash if this happens.
---
 libraries/render-utils/src/Model.cpp  | 2 +-
 libraries/render/src/render/Scene.cpp | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 8d59d5f736..83433d24cb 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -536,7 +536,7 @@ void Model::setVisibleInScene(bool newValue, std::shared_ptr<render::Scene> scen
             pendingChanges.resetItem(item, _modelMeshRenderItems[item]);
         }
         foreach (auto item, _collisionRenderItems.keys()) {
-            pendingChanges.resetItem(item, _modelMeshRenderItems[item]);
+            pendingChanges.resetItem(item, _collisionRenderItems[item]);
         }
         scene->enqueuePendingChanges(pendingChanges);
     }
diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp
index 79f4b2a269..e091b4842c 100644
--- a/libraries/render/src/render/Scene.cpp
+++ b/libraries/render/src/render/Scene.cpp
@@ -16,8 +16,13 @@
 using namespace render;
 
 void PendingChanges::resetItem(ItemID id, const PayloadPointer& payload) {
-    _resetItems.push_back(id);
-    _resetPayloads.push_back(payload);
+    if (payload) {
+        _resetItems.push_back(id);
+        _resetPayloads.push_back(payload);
+    } else {
+        qDebug() << "WARNING: PendingChanges::resetItem with a null payload!";
+        removeItem(id);
+    }
 }
 
 void PendingChanges::removeItem(ItemID id) {

From b6853a0679d64aff3afaae02dbae400981087a98 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 14:47:40 -0700
Subject: [PATCH 33/35] fix packaged server console folder for OS X

---
 server-console/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server-console/CMakeLists.txt b/server-console/CMakeLists.txt
index 9a96b07442..1c6e40c582 100644
--- a/server-console/CMakeLists.txt
+++ b/server-console/CMakeLists.txt
@@ -23,7 +23,7 @@ add_dependencies(${TARGET_NAME} assignment-client domain-server)
 
 # set the packaged console folder depending on platform, so we can copy it
 if (APPLE)
-  set(PACKAGED_CONSOLE_FOLDER "Server\\ Console-darwin-x64/${CONSOLE_EXEC_NAME}")
+  set(PACKAGED_CONSOLE_FOLDER "Sandbox-darwin-x64/${CONSOLE_EXEC_NAME}")
 elseif (WIN32)
   set(PACKAGED_CONSOLE_FOLDER "server-console-win32-x64")
 elseif (UNIX)

From f4d834b07b31ee241e926aa1ee3f17b0f2e9ef3d Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Wed, 30 Mar 2016 16:15:29 -0700
Subject: [PATCH 34/35] OctreeTests: added unit tests for EntityTreeElement
 child accessors

---
 tests/octree/src/OctreeTests.cpp | 32 ++++++++++++++++++++++++++++++++
 tests/octree/src/OctreeTests.h   |  2 ++
 2 files changed, 34 insertions(+)

diff --git a/tests/octree/src/OctreeTests.cpp b/tests/octree/src/OctreeTests.cpp
index ef08855d06..64d68e8e13 100644
--- a/tests/octree/src/OctreeTests.cpp
+++ b/tests/octree/src/OctreeTests.cpp
@@ -795,3 +795,35 @@ void OctreeTests::modelItemTests() {
 #endif 
 }
 
+void OctreeTests::elementAddChildTests() {
+    EntityTreePointer tree = std::make_shared<EntityTree>();
+    auto elem = tree->createNewElement();
+    QCOMPARE((bool)elem->getChildAtIndex(0), false);
+    elem->addChildAtIndex(0);
+    QCOMPARE((bool)elem->getChildAtIndex(0), true);
+
+    const int MAX_CHILD_INDEX = 8;
+    for (int i = 0; i < MAX_CHILD_INDEX; i++) {
+        for (int j = 0; j < MAX_CHILD_INDEX; j++) {
+            auto e = tree->createNewElement();
+
+            // add a single child.
+            auto firstChild = e->addChildAtIndex(i);
+            QCOMPARE(e->getChildAtIndex(i), firstChild);
+
+            if (i != j) {
+                // add a second child.
+                auto secondChild = e->addChildAtIndex(j);
+                QCOMPARE(e->getChildAtIndex(i), firstChild);
+                QCOMPARE(e->getChildAtIndex(j), secondChild);
+
+                // remove scecond child.
+                e->removeChildAtIndex(j);
+
+                QCOMPARE((bool)e->getChildAtIndex(j), false);
+            }
+
+            QCOMPARE(e->getChildAtIndex(i), firstChild);
+        }
+    }
+}
diff --git a/tests/octree/src/OctreeTests.h b/tests/octree/src/OctreeTests.h
index c0e989805a..b236ab08c9 100644
--- a/tests/octree/src/OctreeTests.h
+++ b/tests/octree/src/OctreeTests.h
@@ -25,6 +25,8 @@ private slots:
     // This test is fine
     void modelItemTests();
 
+    void elementAddChildTests();
+
     // TODO: Break these into separate test functions
 };
 

From d8b0dbf3bf8058c7ae0f85f18638fc64eb47c593 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Mar 2016 16:58:35 -0700
Subject: [PATCH 35/35] fix indentation for last inactive check timestamp

---
 ice-server/src/IceServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp
index 9d1bb58ddf..a512d5a049 100644
--- a/ice-server/src/IceServer.cpp
+++ b/ice-server/src/IceServer.cpp
@@ -35,7 +35,7 @@ IceServer::IceServer(int argc, char* argv[]) :
     _serverSocket(),
     _activePeers(),
     _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this),
-	_lastInactiveCheckTimestamp(QDateTime::currentMSecsSinceEpoch())
+    _lastInactiveCheckTimestamp(QDateTime::currentMSecsSinceEpoch())
 {
     // start the ice-server socket
     qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT;