From 68d10a2fe15ca4d90bdaad66a9cb772c555b4077 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Sat, 18 Jan 2020 20:48:00 +0100
Subject: [PATCH 01/24] Make default copy constructors explicit

Recent versions of gcc generate a warning without this
---
 interface/src/raypick/StylusPick.h              | 2 ++
 libraries/animation/src/AnimInverseKinematics.h | 1 +
 libraries/entities/src/EntityItemProperties.h   | 2 ++
 libraries/entities/src/SimulationOwner.h        | 1 +
 libraries/shared/src/CubicHermiteSpline.h       | 4 ++++
 5 files changed, 10 insertions(+)

diff --git a/interface/src/raypick/StylusPick.h b/interface/src/raypick/StylusPick.h
index 27514efefa..89444149d8 100644
--- a/interface/src/raypick/StylusPick.h
+++ b/interface/src/raypick/StylusPick.h
@@ -31,6 +31,8 @@ public:
         surfaceNormal = stylusPickResult.surfaceNormal;
     }
 
+    StylusPickResult& operator=(const StylusPickResult &right) = default;
+
     IntersectionType type { NONE };
     bool intersects { false };
     QUuid objectID;
diff --git a/libraries/animation/src/AnimInverseKinematics.h b/libraries/animation/src/AnimInverseKinematics.h
index bcad7867cc..aa7e8fb69e 100644
--- a/libraries/animation/src/AnimInverseKinematics.h
+++ b/libraries/animation/src/AnimInverseKinematics.h
@@ -162,6 +162,7 @@ protected:
                     const QString& typeVarIn, const QString& weightVarIn, float weightIn, const std::vector<float>& flexCoefficientsIn,
                     const QString& poleVectorEnabledVar, const QString& poleReferenceVectorVar, const QString& poleVectorVar);
         IKTargetVar(const IKTargetVar& orig);
+        AnimInverseKinematics::IKTargetVar& operator=(const AnimInverseKinematics::IKTargetVar&) = default;
 
         QString jointName;
         QString positionVar;
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 63d8183899..7ee6742e7f 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -121,6 +121,8 @@ public:
     static void propertiesToBlob(QScriptEngine& scriptEngine, const QUuid& myAvatarID, const EntityItemProperties& properties, QByteArray& blob);
 
     EntityItemProperties(EntityPropertyFlags desiredProperties = EntityPropertyFlags());
+    EntityItemProperties(const EntityItemProperties&) = default;
+
     virtual ~EntityItemProperties() = default;
 
     void merge(const EntityItemProperties& other);
diff --git a/libraries/entities/src/SimulationOwner.h b/libraries/entities/src/SimulationOwner.h
index 6f37066e47..4039719cd3 100644
--- a/libraries/entities/src/SimulationOwner.h
+++ b/libraries/entities/src/SimulationOwner.h
@@ -112,6 +112,7 @@ public:
 
     SimulationOwner();
     SimulationOwner(const QUuid& id, uint8_t priority);
+    SimulationOwner(const SimulationOwner &) = default;
 
     const QUuid& getID() const { return _id; }
     const uint64_t& getExpiry() const { return _expiry; }
diff --git a/libraries/shared/src/CubicHermiteSpline.h b/libraries/shared/src/CubicHermiteSpline.h
index c83000996b..f91b25aa7a 100644
--- a/libraries/shared/src/CubicHermiteSpline.h
+++ b/libraries/shared/src/CubicHermiteSpline.h
@@ -19,6 +19,8 @@ public:
 
     CubicHermiteSplineFunctor(const CubicHermiteSplineFunctor& orig) : _p0(orig._p0), _m0(orig._m0), _p1(orig._p1), _m1(orig._m1) {}
 
+    CubicHermiteSplineFunctor& operator=(const CubicHermiteSplineFunctor&) = default;
+
     virtual ~CubicHermiteSplineFunctor() {}
 
     // evalute the hermite curve at parameter t (0..1)
@@ -85,6 +87,8 @@ public:
         memcpy(_values, orig._values, sizeof(float) * (NUM_SUBDIVISIONS + 1));
     }
 
+    CubicHermiteSplineFunctorWithArcLength& operator=(const CubicHermiteSplineFunctorWithArcLength&) = default;
+
     // given the spline parameter (0..1) output the arcLength of the spline up to that point.
     float arcLength(float t) const {
         float index = t * NUM_SUBDIVISIONS;

From d0dc041275ae9b0eae64a5776159bfbcdba35bc5 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Sun, 19 Jan 2020 11:24:51 +0100
Subject: [PATCH 02/24] Another default operator= and copy constructor

---
 libraries/image/src/image/Image.h              | 2 +-
 libraries/shared/src/shared/MediaTypeLibrary.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/image/src/image/Image.h b/libraries/image/src/image/Image.h
index dd39383dfb..14aa12d11a 100644
--- a/libraries/image/src/image/Image.h
+++ b/libraries/image/src/image/Image.h
@@ -59,7 +59,7 @@ namespace image {
         Image() : _dims(0,0) {}
         Image(int width, int height, Format format);
         Image(const QImage& data) : _packedData(data), _dims(data.width(), data.height()), _format((Format)data.format()) {}
-
+        Image(const Image &other) = default;
         void operator=(const QImage& other) {
             _packedData = other;
             _floatData.clear();
diff --git a/libraries/shared/src/shared/MediaTypeLibrary.h b/libraries/shared/src/shared/MediaTypeLibrary.h
index c87da01fa1..d4931c1601 100644
--- a/libraries/shared/src/shared/MediaTypeLibrary.h
+++ b/libraries/shared/src/shared/MediaTypeLibrary.h
@@ -48,6 +48,7 @@ public:
         webMediaTypes(mediaType.webMediaTypes),
         fileSignatures(mediaType.fileSignatures) {
     }
+    MediaType& operator=(const MediaType&) = default;
 
     static MediaType NONE;
 

From 6c81f597af58d63f53ab1a66041fb6753362084c Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 22 Jan 2020 20:55:50 +1300
Subject: [PATCH 03/24] Display vertical scrollbar in Settings dialogs that
 scroll

---
 interface/resources/qml/hifi/audio/Audio.qml  |  4 +-
 .../tabletWindows/TabletPreferencesDialog.qml | 45 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index eef339b854..2f5ac68b4b 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -44,7 +44,6 @@ Rectangle {
         return (root.parent !== null) && root.parent.objectName == "loader";
     }
 
-
     property bool isVR: AudioScriptingInterface.context === "VR"
     property real rightMostInputLevelPos: root.width
     //placeholder for control sizes and paddings
@@ -128,7 +127,8 @@ Rectangle {
             anchors.top: flickView.top;
             anchors.right: flickView.right;
             anchors.bottom: flickView.bottom;
-            anchors.rightMargin: -verticalScrollWidth; //compensate flickView's right margin
+            anchors.rightMargin: 2
+
             background: Item {
                 implicitWidth: verticalScrollWidth;
                 Rectangle {
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
index 66661843e6..7e672aafaa 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
@@ -9,6 +9,7 @@
 //
 
 import QtQuick 2.5
+import QtQuick.Controls 2.2
 
 import "."
 import "./preferences"
@@ -33,7 +34,10 @@ Item {
     property bool gotoPreviousAppFromScript: false
 
     property var tablet;
-  
+
+    readonly property real verticalScrollWidth: 10
+    readonly property real verticalScrollShaft: 8
+
     function saveAll() {
         dialog.forceActiveFocus();  // Accept any text box edits in progress.
 
@@ -103,6 +107,43 @@ Item {
             height: parent.height
             contentWidth: parent.width
             contentHeight: getSectionsHeight();
+
+            anchors.top: main.top
+            anchors.bottom: main.bottom
+
+            ScrollBar.vertical: ScrollBar {
+                policy: ScrollBar.AlwaysOn
+                parent: scrollView.parent
+                anchors.top: scrollView.top
+                anchors.right: scrollView.right
+                anchors.bottom: scrollView.bottom
+                anchors.rightMargin: 2
+
+                background: Item {
+                    implicitWidth: verticalScrollWidth
+                    Rectangle {
+                        color: hifi.colors.darkGray30;
+                        radius: 4
+                        anchors {
+                            fill: parent
+                        }
+                    }
+                }
+                contentItem: Item {
+                    implicitWidth: verticalScrollShaft
+                    Rectangle {
+                        radius: verticalScrollShaft/2
+                        color: hifi.colors.white30
+                        anchors {
+                            fill: parent
+                            leftMargin: 1  // Finesse size and position.
+                            topMargin: 1
+                            bottomMargin: 1
+                        }
+                    }
+                }
+            }
+
             Column {
                 width: 480
                 Component {
@@ -183,7 +224,7 @@ Item {
                 for (var i = 0; i < sections.length; i++) {
                     totalHeight += sections[i].height + sections[i].getPreferencesHeight();
                 }
-                var bottomPadding = 170;
+                var bottomPadding = 30;
                 return (totalHeight + bottomPadding);
             }
         }

From cfde36c9f5f47121eee6f7bf6be7983b07c60f76 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 23 Jan 2020 11:25:48 +1300
Subject: [PATCH 04/24] Fix up scrollbars and separators

---
 interface/resources/qml/hifi/audio/Audio.qml        | 13 +++++--------
 .../tabletWindows/TabletPreferencesDialog.qml       |  6 +++---
 interface/resources/qml/windows/ScrollingWindow.qml |  4 +---
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index 2f5ac68b4b..963a3246fc 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -127,17 +127,16 @@ Rectangle {
             anchors.top: flickView.top;
             anchors.right: flickView.right;
             anchors.bottom: flickView.bottom;
-            anchors.rightMargin: 2
+            z: 100  // Display over top of separators.
 
             background: Item {
                 implicitWidth: verticalScrollWidth;
                 Rectangle {
-                    color: hifi.colors.darkGray30;
+                    color: hifi.colors.baseGrayShadow
                     radius: 4;
                     anchors {
                         fill: parent;
-                        topMargin: -1;  // Finesse size
-                        bottomMargin: -2;
+                        topMargin: 2  // Finess position
                     }
                 }
             }
@@ -148,9 +147,7 @@ Rectangle {
                     color: hifi.colors.white30;
                     anchors {
                         fill: parent;
-                        leftMargin: 2;  // Finesse size and position.
-                        topMargin: 1;
-                        bottomMargin: 1;
+                        topMargin: 1;  // Finesse position.
                     }
                 }
             }
@@ -338,7 +335,6 @@ Rectangle {
             anchors.topMargin: 10;
         }
 
-
         Item {
             id: inputDeviceHeader
             x: margins.paddings;
@@ -688,4 +684,5 @@ Rectangle {
             anchors.topMargin: 10;
         }
     }
+
 }
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
index 7e672aafaa..cedbfb0fe1 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
@@ -117,15 +117,16 @@ Item {
                 anchors.top: scrollView.top
                 anchors.right: scrollView.right
                 anchors.bottom: scrollView.bottom
-                anchors.rightMargin: 2
+                z: 100  // Display over top of separators.
 
                 background: Item {
                     implicitWidth: verticalScrollWidth
                     Rectangle {
-                        color: hifi.colors.darkGray30;
+                        color: hifi.colors.baseGrayShadow
                         radius: 4
                         anchors {
                             fill: parent
+                            bottomMargin: 1
                         }
                     }
                 }
@@ -136,7 +137,6 @@ Item {
                         color: hifi.colors.white30
                         anchors {
                             fill: parent
-                            leftMargin: 1  // Finesse size and position.
                             topMargin: 1
                             bottomMargin: 1
                         }
diff --git a/interface/resources/qml/windows/ScrollingWindow.qml b/interface/resources/qml/windows/ScrollingWindow.qml
index 70640a2b75..0c91b58e31 100644
--- a/interface/resources/qml/windows/ScrollingWindow.qml
+++ b/interface/resources/qml/windows/ScrollingWindow.qml
@@ -97,11 +97,10 @@ Windows.Window {
                 background: Item {
                     implicitWidth: verticalScrollWidth
                     Rectangle {
-                        color: hifi.colors.darkGray30
+                        color: hifi.colors.baseGrayShadow
                         radius: 4
                         anchors {
                             fill: parent
-                            topMargin: -1  // Finesse size
                             bottomMargin: -2
                         }
                     }
@@ -113,7 +112,6 @@ Windows.Window {
                         color: hifi.colors.white30
                         anchors {
                             fill: parent
-                            leftMargin: 2  // Finesse size and position.
                             topMargin: 1
                             bottomMargin: 1
                         }

From b8e41fd244c68b2063193a488e7964ad5ffcb63b Mon Sep 17 00:00:00 2001
From: Fluffy Jenkins <richardjrn.w@gmail.com>
Date: Tue, 28 Jan 2020 22:06:27 +0000
Subject: [PATCH 05/24] Added basic beta default scripts feature

---
 scripts/defaultScripts.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 795458f05d..8ba12f8e8b 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -39,7 +39,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
 var DEFAULT_SCRIPTS_SEPARATE = [
     "system/controllers/controllerScripts.js",
     "communityModules/notificationCore/notificationCore.js",
-    "communityModules/chat/FloofChat.js"
+    {"stable": "communityModules/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"}
     //"system/chat.js"
 ];
 
@@ -53,7 +53,8 @@ var MENU_CATEGORY = "Developer > Scripting";
 var MENU_ITEM = "Debug defaultScripts.js";
 
 var SETTINGS_KEY = '_debugDefaultScriptsIsChecked';
-var previousSetting = Settings.getValue(SETTINGS_KEY);
+var SETTINGS_KEY_BETA = '_betaDefaultScriptsIsChecked';
+var previousSetting = Settings.getValue(SETTINGS_KEY, false);
 
 if (previousSetting === '' || previousSetting === false || previousSetting === 'false') {
     previousSetting = false;
@@ -71,23 +72,31 @@ if (Menu.menuExists(MENU_CATEGORY) && !Menu.menuItemExists(MENU_CATEGORY, MENU_I
         isChecked: previousSetting,
     });
 }
-
 function loadSeparateDefaults() {
     var currentlyRunningScripts = ScriptDiscoveryService.getRunning();
 
     for (var i in DEFAULT_SCRIPTS_SEPARATE) {
         var shouldLoadCurrentDefaultScript = true;
+        var scriptItem = DEFAULT_SCRIPTS_SEPARATE[i];
+        if (typeof scriptItem === "object") {
+            if (previousSettingBeta) {
+                console.info("Loading Beta item " + scriptItem.beta);
+                scriptItem = scriptItem.beta;
+            } else {
+                scriptItem = scriptItem.stable;
+            }
+        }
 
         for (var j = 0; j < currentlyRunningScripts.length; j++) {
             var currentRunningScriptObject = currentlyRunningScripts[j];
-            var currentDefaultScriptName = DEFAULT_SCRIPTS_SEPARATE[i].substr((DEFAULT_SCRIPTS_SEPARATE[i].lastIndexOf("/") + 1), DEFAULT_SCRIPTS_SEPARATE[i].length);
+            var currentDefaultScriptName = scriptItem.substr((scriptItem.lastIndexOf("/") + 1), scriptItem.length);
             if (currentDefaultScriptName === currentRunningScriptObject.name) {
                 shouldLoadCurrentDefaultScript = false;
             }
         }
 
         if (shouldLoadCurrentDefaultScript) {
-            Script.load(DEFAULT_SCRIPTS_SEPARATE[i]);
+            Script.load(scriptItem);
         }
     }
 }
@@ -161,7 +170,7 @@ function removeMenuItem() {
     }
 }
 
-Script.scriptEnding.connect(function() {
+Script.scriptEnding.connect(function () {
     removeMenuItem();
 });
 

From a66bbcb12564a6b6a7b53fffe06a07732467953b Mon Sep 17 00:00:00 2001
From: Fluffy Jenkins <richardjrn.w@gmail.com>
Date: Tue, 28 Jan 2020 22:23:01 +0000
Subject: [PATCH 06/24] Made fixes

---
 scripts/defaultScripts.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 8ba12f8e8b..af802ddc1e 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -54,7 +54,8 @@ var MENU_ITEM = "Debug defaultScripts.js";
 
 var SETTINGS_KEY = '_debugDefaultScriptsIsChecked';
 var SETTINGS_KEY_BETA = '_betaDefaultScriptsIsChecked';
-var previousSetting = Settings.getValue(SETTINGS_KEY, false);
+var previousSetting = Settings.getValue(SETTINGS_KEY, false);;
+var previousSettingBeta = Settings.getValue(SETTINGS_KEY_BETA, false);
 
 if (previousSetting === '' || previousSetting === false || previousSetting === 'false') {
     previousSetting = false;
@@ -91,7 +92,7 @@ function loadSeparateDefaults() {
             var currentRunningScriptObject = currentlyRunningScripts[j];
             var currentDefaultScriptName = scriptItem.substr((scriptItem.lastIndexOf("/") + 1), scriptItem.length);
             if (currentDefaultScriptName === currentRunningScriptObject.name) {
-                shouldLoadCurrentDefaultScript = false;
+                ScriptDiscoveryService.stopScript(currentRunningScriptObject.url);
             }
         }
 

From 5492759a0c8223f9838b920d4f932fefbb35ebe2 Mon Sep 17 00:00:00 2001
From: Fluffy Jenkins <richardjrn.w@gmail.com>
Date: Wed, 29 Jan 2020 19:50:23 +0000
Subject: [PATCH 07/24] Made requested changes and changed how it loads

---
 scripts/defaultScripts.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index af802ddc1e..7ea1632314 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -54,7 +54,7 @@ var MENU_ITEM = "Debug defaultScripts.js";
 
 var SETTINGS_KEY = '_debugDefaultScriptsIsChecked';
 var SETTINGS_KEY_BETA = '_betaDefaultScriptsIsChecked';
-var previousSetting = Settings.getValue(SETTINGS_KEY, false);;
+var previousSetting = Settings.getValue(SETTINGS_KEY, false);
 var previousSettingBeta = Settings.getValue(SETTINGS_KEY_BETA, false);
 
 if (previousSetting === '' || previousSetting === false || previousSetting === 'false') {
@@ -73,6 +73,7 @@ if (Menu.menuExists(MENU_CATEGORY) && !Menu.menuItemExists(MENU_CATEGORY, MENU_I
         isChecked: previousSetting,
     });
 }
+
 function loadSeparateDefaults() {
     var currentlyRunningScripts = ScriptDiscoveryService.getRunning();
 
@@ -81,7 +82,7 @@ function loadSeparateDefaults() {
         var scriptItem = DEFAULT_SCRIPTS_SEPARATE[i];
         if (typeof scriptItem === "object") {
             if (previousSettingBeta) {
-                console.info("Loading Beta item " + scriptItem.beta);
+                console.log("Loading Beta item " + scriptItem.beta);
                 scriptItem = scriptItem.beta;
             } else {
                 scriptItem = scriptItem.stable;
@@ -92,7 +93,11 @@ function loadSeparateDefaults() {
             var currentRunningScriptObject = currentlyRunningScripts[j];
             var currentDefaultScriptName = scriptItem.substr((scriptItem.lastIndexOf("/") + 1), scriptItem.length);
             if (currentDefaultScriptName === currentRunningScriptObject.name) {
-                ScriptDiscoveryService.stopScript(currentRunningScriptObject.url);
+                if (currentRunningScriptObject.url !== scriptItem) {
+                    ScriptDiscoveryService.stopScript(currentRunningScriptObject.url);
+                } else {
+                    shouldLoadCurrentDefaultScript = false;
+                }
             }
         }
 

From 46173439ed2cb860d6df14dc8e7531b477d2c8e0 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 1 Feb 2020 12:46:28 +1300
Subject: [PATCH 08/24] Enable serverless domains via HTTP and HTTPS

---
 interface/src/Application.cpp               | 40 +++++++++++----------
 interface/src/Application.h                 |  2 +-
 libraries/networking/src/AddressManager.cpp |  7 ++--
 libraries/octree/src/Octree.cpp             | 19 +++++++++-
 libraries/octree/src/Octree.h               |  1 +
 5 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6a1925c7fb..ccca85e7ec 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4059,7 +4059,7 @@ void Application::setIsServerlessMode(bool serverlessDomain) {
     }
 }
 
-std::map<QString, QString> Application::prepareServerlessDomainContents(QUrl domainURL) {
+std::map<QString, QString> Application::prepareServerlessDomainContents(QUrl domainURL, QByteArray data) {
     QUuid serverlessSessionID = QUuid::createUuid();
     getMyAvatar()->setSessionUUID(serverlessSessionID);
     auto nodeList = DependencyManager::get<NodeList>();
@@ -4070,14 +4070,13 @@ std::map<QString, QString> Application::prepareServerlessDomainContents(QUrl dom
     permissions.setAll(true);
     nodeList->setPermissions(permissions);
 
-    // we can't import directly into the main tree because we would need to lock it, and
-    // Octree::readFromURL calls loop.exec which can run code which will also attempt to lock the tree.
+    // FIXME: Lock the main tree and import directly into it.
     EntityTreePointer tmpTree(new EntityTree());
     tmpTree->setIsServerlessMode(true);
     tmpTree->createRootElement();
     auto myAvatar = getMyAvatar();
     tmpTree->setMyAvatar(myAvatar);
-    bool success = tmpTree->readFromURL(domainURL.toString());
+    bool success = tmpTree->readFromByteArray(domainURL.toString(), data);
     if (success) {
         tmpTree->reaverageOctreeElements();
         tmpTree->sendEntities(&_entityEditSender, getEntities()->getTree(), 0, 0, 0);
@@ -4100,12 +4099,26 @@ void Application::loadServerlessDomain(QUrl domainURL) {
         return;
     }
 
-    auto namedPaths = prepareServerlessDomainContents(domainURL);
-    auto nodeList = DependencyManager::get<NodeList>();
+    QString trimmedUrl = domainURL.toString().trimmed();
+    bool DEFAULT_IS_OBSERVABLE = true;
+    const qint64 DEFAULT_CALLER_ID = -1;
+    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(
+        this, trimmedUrl, DEFAULT_IS_OBSERVABLE, DEFAULT_CALLER_ID, "Application::loadServerlessDomain");
 
-    nodeList->getDomainHandler().connectedToServerless(namedPaths);
+    if (!request) {
+        return;
+    }
 
-    _fullSceneReceivedCounter++;
+    connect(request, &ResourceRequest::finished, this, [=]() {
+        if (request->getResult() == ResourceRequest::Success) {
+            auto namedPaths = prepareServerlessDomainContents(domainURL, request->getData());
+            auto nodeList = DependencyManager::get<NodeList>();
+            nodeList->getDomainHandler().connectedToServerless(namedPaths);
+            _fullSceneReceivedCounter++;
+        }
+        request->deleteLater();
+    });
+    request->send();
 }
 
 void Application::loadErrorDomain(QUrl domainURL) {
@@ -4114,16 +4127,7 @@ void Application::loadErrorDomain(QUrl domainURL) {
         return;
     }
 
-    if (domainURL.isEmpty()) {
-        return;
-    }
-
-    auto namedPaths = prepareServerlessDomainContents(domainURL);
-    auto nodeList = DependencyManager::get<NodeList>();
-
-    nodeList->getDomainHandler().loadedErrorDomain(namedPaths);
-
-    _fullSceneReceivedCounter++;
+    loadServerlessDomain(domainURL);
 }
 
 bool Application::importImage(const QString& urlString) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 114bca864d..198f5ef7cf 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -464,7 +464,7 @@ public slots:
     void setPreferredCursor(const QString& cursor);
 
     void setIsServerlessMode(bool serverlessDomain);
-    std::map<QString, QString> prepareServerlessDomainContents(QUrl domainURL);
+    std::map<QString, QString> prepareServerlessDomainContents(QUrl domainURL, QByteArray data);
 
     void loadServerlessDomain(QUrl domainURL);
     void loadErrorDomain(QUrl domainURL);
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 50e2657622..5c821bdbf5 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -358,11 +358,8 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger) {
         emit lookupResultsFinished();
 
         return true;
-    } else if (lookupUrl.scheme() == HIFI_URL_SCHEME_FILE) {
-        // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
-        // be loaded over http(s)
-        // lookupUrl.scheme() == URL_SCHEME_HTTP ||
-        // lookupUrl.scheme() == HIFI_URL_SCHEME_HTTPS ||
+    } else if (lookupUrl.scheme() == HIFI_URL_SCHEME_FILE || lookupUrl.scheme() == HIFI_URL_SCHEME_HTTPS
+            || lookupUrl.scheme() == HIFI_URL_SCHEME_HTTP) {
         // TODO once a file can return a connection refusal if there were to be some kind of load error, we'd
         // need to store the previous domain tried in _lastVisitedURL. For now , do not store it.
 
diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index df02b54856..aac0de27a1 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -738,7 +738,6 @@ bool Octree::readFromURL(
 ) {
     QString trimmedUrl = urlString.trimmed();
     QString marketplaceID = getMarketplaceID(trimmedUrl);
-    qDebug() << "!!!!! going to createResourceRequest " << callerId;
     auto request = std::unique_ptr<ResourceRequest>(
         DependencyManager::get<ResourceManager>()->createResourceRequest(
             this, trimmedUrl, isObservable, callerId, "Octree::readFromURL"));
@@ -770,6 +769,24 @@ bool Octree::readFromURL(
     return readFromStream(data.size(), inputStream, marketplaceID);
 }
 
+bool Octree::readFromByteArray(
+    const QString& urlString,
+    const QByteArray& data
+) {
+    QString trimmedUrl = urlString.trimmed();
+    QString marketplaceID = getMarketplaceID(trimmedUrl);
+
+    QByteArray uncompressedJsonData;
+    bool wasCompressed = gunzip(data, uncompressedJsonData);
+
+    if (wasCompressed) {
+        QDataStream inputStream(uncompressedJsonData);
+        return readFromStream(uncompressedJsonData.size(), inputStream, marketplaceID);
+    }
+
+    QDataStream inputStream(data);
+    return readFromStream(data.size(), inputStream, marketplaceID);
+}
 
 bool Octree::readFromStream(
     uint64_t streamLength,
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index 4f994da60e..45dae3049d 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -217,6 +217,7 @@ public:
     // Octree importers
     bool readFromFile(const char* filename);
     bool readFromURL(const QString& url, const bool isObservable = true, const qint64 callerId = -1); // will support file urls as well...
+    bool readFromByteArray(const QString& url, const QByteArray& byteArray);
     bool readFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID="");
     bool readSVOFromStream(uint64_t streamLength, QDataStream& inputStream);
     bool readJSONFromStream(uint64_t streamLength, QDataStream& inputStream, const QString& marketplaceID="");

From 1112367b06daaa8064aac322fe7c6590558aaeca Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sun, 2 Feb 2020 20:57:56 +1300
Subject: [PATCH 09/24] Handle localStorage not being available

---
 .../hifi-jsdoc-template/tmpl/layout.tmpl      | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
index 76262ec499..6d12ccd816 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
@@ -34,17 +34,29 @@
     </style>
     <script>
     //We are running the check here to preload the theme because it may load the incorrect one first for a split second.
-    var darkDisabled = JSON.parse(localStorage.getItem('darkDisabled'));
-    if (darkDisabled == null) {
-        localStorage.setItem('darkDisabled', JSON.stringify(false));
+    var isLocalStorageSupported = false;
+    try { // Edge browsing files on local file system doesn't support localStorage.
+        if (localStorage) {
+            isLocalStorageSupported = true;
+        }
+    } catch (e) {
+        // nop
+    }
+    
+    var defaultDarkDisabled = false;
+    var darkDisabled = isLocalStorageSupported ? JSON.parse(localStorage.getItem('darkDisabled')) : defaultDarkDisabled;
+    if (darkDisabled === null) {
+        localStorage.setItem('darkDisabled', JSON.stringify(defaultDarkDisabled));
     } else {
         var nightSheet = document.querySelector('[href="styles/night.css"]');
         nightSheet.disabled = darkDisabled;
     }
 
-    var responsiveDisabled = JSON.parse(localStorage.getItem('responsiveDisabled'));
+    var defaultResponsiveDisabled = true;
+    var responsiveDisabled = 
+        isLocalStorageSupported ? JSON.parse(localStorage.getItem('responsiveDisabled')) : defaultResponsiveDisabled;
     if (responsiveDisabled === null) {
-        localStorage.setItem('responsiveDisabled', JSON.stringify(true));
+        localStorage.setItem('responsiveDisabled', JSON.stringify(defaultResponsiveDisabled));
     } else {
         var responsiveSheet = document.querySelector('[href="styles/responsive.css"]');
         responsiveSheet.disabled = responsiveDisabled;

From fa30866701fc1bd58d45d526131c322ebd849b32 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 6 Feb 2020 07:02:05 +1300
Subject: [PATCH 10/24] Remember serverless HTTP and HTTPS domains

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

diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 5c821bdbf5..3cf71cc9af 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -157,6 +157,7 @@ void AddressManager::storeCurrentAddress() {
     auto url = currentAddress();
 
     if (url.scheme() == HIFI_URL_SCHEME_FILE ||
+        url.scheme() == HIFI_URL_SCHEME_HTTP || url.scheme() == HIFI_URL_SCHEME_HTTPS ||
         (url.scheme() == URL_SCHEME_HIFI && !url.host().isEmpty())) {
         // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
         // be loaded over http(s)

From 08ec9ef3b7a4debf8aeb5c668d7bbbac2ae2067e Mon Sep 17 00:00:00 2001
From: Kasen IO <kasenvr@gmail.com>
Date: Wed, 5 Feb 2020 15:25:51 -0500
Subject: [PATCH 11/24] Various URL updates + window title update.

---
 interface/resources/qml/+webengine/BrowserWebView.qml | 2 +-
 interface/src/Application.cpp                         | 2 +-
 libraries/entities/src/EntityItemProperties.cpp       | 2 +-
 libraries/ui/src/ui/TabletScriptingInterface.h        | 2 +-
 script-archive/tests/performance/renderableMatrix.js  | 2 +-
 scripts/system/create/edit.js                         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/+webengine/BrowserWebView.qml b/interface/resources/qml/+webengine/BrowserWebView.qml
index 137531f517..7f2136ec4f 100644
--- a/interface/resources/qml/+webengine/BrowserWebView.qml
+++ b/interface/resources/qml/+webengine/BrowserWebView.qml
@@ -6,7 +6,7 @@ import controlsUit 1.0
 
 WebView {
     id: webview
-    url: "https://highfidelity.com/"
+    url: "https://projectathena.io/"
     profile: FileTypeProfile;
 
     property var parentRoot: null
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6a1925c7fb..531a0095bb 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3185,7 +3185,7 @@ void Application::showLoginScreen() {
         QJsonObject loginData = {};
         loginData["action"] = "login dialog popped up";
         UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
-        _window->setWindowTitle("High Fidelity");
+        _window->setWindowTitle("Project Athena");
     } else {
         resumeAfterLoginDialogActionTaken();
     }
diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 2b8f2b4c14..9afaa5e85b 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1366,7 +1366,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  * var METERS_TO_INCHES = 39.3701;
  * var entity = Entities.addEntity({
  *     type: "Web",
- *     sourceUrl: "https://highfidelity.com/",
+ *     sourceUrl: "https://projectathena.io/",
  *     position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.75, z: -4 })),
  *     rotation: MyAvatar.orientation,
  *     dimensions: {
diff --git a/libraries/ui/src/ui/TabletScriptingInterface.h b/libraries/ui/src/ui/TabletScriptingInterface.h
index 04222b3ea1..dd5ec2a845 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.h
+++ b/libraries/ui/src/ui/TabletScriptingInterface.h
@@ -105,7 +105,7 @@ public:
      * @returns {TabletProxy} The tablet instance.
      * @example <caption>Display the High Fidelity home page on the system tablet.</caption>
      * var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-     * tablet.gotoWebScreen("https://highfidelity.com/");
+     * tablet.gotoWebScreen("https://projectathena.io/");
      */
     Q_INVOKABLE TabletProxy* getTablet(const QString& tabletId);
 
diff --git a/script-archive/tests/performance/renderableMatrix.js b/script-archive/tests/performance/renderableMatrix.js
index dd0fd6e54d..04946328cc 100644
--- a/script-archive/tests/performance/renderableMatrix.js
+++ b/script-archive/tests/performance/renderableMatrix.js
@@ -114,7 +114,7 @@ Script.setInterval(function () {
         if (isModel) {
             properties.modelURL = type;
         } else if (type === 'Web') {
-            properties.sourceUrl = 'https://highfidelity.com';
+            properties.sourceUrl = 'https://projectathena.io';
         } else {
             properties.color = { red: x / ROWS_X * 255, green: y / ROWS_Y * 255, blue: z / ROWS_Z * 255 };
             if (type === 'ParticleEffect') {
diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
index c57f4bae50..ef07aa4d6e 100644
--- a/scripts/system/create/edit.js
+++ b/scripts/system/create/edit.js
@@ -427,7 +427,7 @@ const DEFAULT_ENTITY_PROPERTIES = {
             y: 0.9,
             z: 0.01
         },
-        sourceUrl: "https://highfidelity.com/",
+        sourceUrl: "https://projectathena.io/",
         dpi: 30,
     },
     ParticleEffect: {

From ad427e31a707fd347fa522cf7f52c659594b3e85 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 6 Feb 2020 11:11:41 +1300
Subject: [PATCH 12/24] Make --url take existing Interface to FILE, HTTP, and
 HTTPS serverless

---
 interface/src/Application.cpp | 2 +-
 interface/src/main.cpp        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ccca85e7ec..a566ce61d7 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -9263,7 +9263,7 @@ void Application::readArgumentsFromLocalSocket() const {
 
     // If we received a message, try to open it as a URL
     if (message.length() > 0) {
-        DependencyManager::get<WindowScriptingInterface>()->openUrl(QString::fromUtf8(message));
+        DependencyManager::get<AddressManager>()->handleLookupString(QString::fromUtf8(message));
     }
 }
 
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 5ca4d18a45..81616e5773 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -262,7 +262,9 @@ int main(int argc, const char* argv[]) {
         if (socket.waitForConnected(LOCAL_SERVER_TIMEOUT_MS)) {
             if (parser.isSet(urlOption)) {
                 QUrl url = QUrl(parser.value(urlOption));
-                if (url.isValid() && (url.scheme() == URL_SCHEME_HIFI || url.scheme() == URL_SCHEME_HIFIAPP)) {
+                if (url.isValid() && (url.scheme() == URL_SCHEME_HIFI || url.scheme() == URL_SCHEME_HIFIAPP
+                        || url.scheme() == HIFI_URL_SCHEME_HTTP || url.scheme() == HIFI_URL_SCHEME_HTTPS
+                        || url.scheme() == HIFI_URL_SCHEME_FILE)) {
                     qDebug() << "Writing URL to local socket";
                     socket.write(url.toString().toUtf8());
                     if (!socket.waitForBytesWritten(5000)) {

From 4f0cc2ebd5dfab4d9df65b6326cd4c106ecf307d Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 6 Feb 2020 11:28:51 +1300
Subject: [PATCH 13/24] Remove dead code

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a566ce61d7..fb7835365d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -512,27 +512,6 @@ std::atomic<uint64_t> DeadlockWatchdogThread::_maxElapsed;
 std::atomic<int> DeadlockWatchdogThread::_maxElapsedAverage;
 ThreadSafeMovingAverage<int, DeadlockWatchdogThread::HEARTBEAT_SAMPLES> DeadlockWatchdogThread::_movingAverage;
 
-bool isDomainURL(QUrl url) {
-    if (!url.isValid()) {
-        return false;
-    }
-    if (url.scheme() == URL_SCHEME_HIFI) {
-        return true;
-    }
-    if (url.scheme() != HIFI_URL_SCHEME_FILE) {
-        // TODO -- once Octree::readFromURL no-longer takes over the main event-loop, serverless-domain urls can
-        // be loaded over http(s)
-        // && url.scheme() != HIFI_URL_SCHEME_HTTP &&
-        // url.scheme() != HIFI_URL_SCHEME_HTTPS
-        return false;
-    }
-    if (url.path().endsWith(".json", Qt::CaseInsensitive) ||
-        url.path().endsWith(".json.gz", Qt::CaseInsensitive)) {
-        return true;
-    }
-    return false;
-}
-
 #ifdef Q_OS_WIN
 static const UINT UWM_IDENTIFY_INSTANCES =
     RegisterWindowMessage("UWM_IDENTIFY_INSTANCES_{8AB82783-B74A-4258-955B-8188C22AA0D6}_" + qgetenv("USERNAME"));
@@ -564,14 +543,6 @@ public:
                 return true;
             }
 
-            if (message->message == WM_COPYDATA) {
-                COPYDATASTRUCT* pcds = (COPYDATASTRUCT*)(message->lParam);
-                QUrl url = QUrl((const char*)(pcds->lpData));
-                if (isDomainURL(url)) {
-                    DependencyManager::get<AddressManager>()->handleLookupString(url.toString());
-                    return true;
-                }
-            }
             // Attempting to close MIDI interfaces of a hot-unplugged device can result in audio-driver deadlock.
             // Detecting MIDI devices that have been added/removed after starting Inteface has been disabled.
             // https://support.microsoft.com/en-us/help/4460006/midi-device-app-hangs-when-former-midi-api-is-used

From 39f23b52c32cc6f7dc127a680e11e4f666bef746 Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Wed, 5 Feb 2020 23:30:04 +0100
Subject: [PATCH 14/24] Force dynamic build on Linux, fixes #151

---
 cmake/init.cmake         | 10 +++++++++-
 interface/CMakeLists.txt |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/cmake/init.cmake b/cmake/init.cmake
index aac350ce0b..e97cfa476e 100644
--- a/cmake/init.cmake
+++ b/cmake/init.cmake
@@ -61,4 +61,12 @@ endif ()
 
 if (APPLE)
   set(CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS "--deep")
-endif()
\ No newline at end of file
+endif()
+
+if (UNIX)
+  # Static libs result in duplicated constructor and destructor calls on Linux
+  # and crashes on exit, and perhaps loss of global state on plugin loads.
+  #
+  # This will need to be looked at closely before Linux can have a static build.
+  set(BUILD_SHARED_LIBS ON)
+endif ()
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index f800f9c8aa..155d90efcb 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -142,6 +142,9 @@ if (APPLE)
   list(APPEND INTERFACE_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/icon/${INTERFACE_ICON_FILENAME})
 endif()
 
+if (UNIX)
+  set(BUILD_SHARED_LIBS ON)
+endif ()
 
 # create the executable, make it a bundle on OS X
 if (APPLE)

From 82a0308a645fbaf2fb34dc09854017997a26d287 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 7 Feb 2020 10:08:51 +1300
Subject: [PATCH 15/24] Save the last visited domain URL

---
 libraries/networking/src/AddressManager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 3cf71cc9af..19448063cd 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -361,8 +361,9 @@ bool AddressManager::handleUrl(const QUrl& lookupUrlIn, LookupTrigger trigger) {
         return true;
     } else if (lookupUrl.scheme() == HIFI_URL_SCHEME_FILE || lookupUrl.scheme() == HIFI_URL_SCHEME_HTTPS
             || lookupUrl.scheme() == HIFI_URL_SCHEME_HTTP) {
-        // TODO once a file can return a connection refusal if there were to be some kind of load error, we'd
-        // need to store the previous domain tried in _lastVisitedURL. For now , do not store it.
+               
+        // Save the last visited domain URL.
+        _lastVisitedURL = lookupUrl;
 
         _previousAPILookup.clear();
         _shareablePlaceName.clear();

From 166c7809a9a03f75c32cc4462b96a9a8d02b82d5 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 7 Feb 2020 10:09:37 +1300
Subject: [PATCH 16/24] Fix missing "no connection" dialog for invalid
 serverless domain URLs

---
 libraries/networking/src/DomainHandler.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index 3512b02d11..fa4e3dc29b 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -209,7 +209,9 @@ void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) {
     }
 
     // if it's in the error state, reset and try again.
-    if ((_domainURL != domainURL || _sockAddr.getPort() != domainPort) || _isInErrorState) {
+    if (_domainURL != domainURL 
+        || (_sockAddr.getPort() != domainPort && domainURL.scheme() == URL_SCHEME_HIFI)
+        || _isInErrorState) {
         // re-set the domain info so that auth information is reloaded
         hardReset("Changing domain URL");
 

From 7c87f8971272fe641589c0a3727a1c7837d4fbe4 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 7 Feb 2020 11:12:54 +1300
Subject: [PATCH 17/24] Add FIXME for Clipboard.importEntities()

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

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index fb7835365d..83f7495372 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5517,6 +5517,8 @@ bool Application::importEntities(const QString& urlOrFilename, const bool isObse
     _entityClipboard->withWriteLock([&] {
         _entityClipboard->eraseAllOctreeElements();
 
+        // FIXME: readFromURL() can take over the main event loop which may cause problems, especially if downloading the JSON 
+        // from the Web.
         success = _entityClipboard->readFromURL(urlOrFilename, isObservable, callerId);
         if (success) {
             _entityClipboard->reaverageOctreeElements();

From 5a91de016e539817561740e720c1319cac7c328e Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 8 Feb 2020 16:50:46 +1300
Subject: [PATCH 18/24] Fix scripts not running at Interface start after
 reloading all scripts

---
 libraries/script-engine/src/ScriptEngines.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp
index fd2ebe300d..12eaa011a9 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -412,7 +412,7 @@ void ScriptEngines::stopAllScripts(bool restart) {
             continue;
         }
 
-        bool isOverrideScript = it.key().toString().compare(this->_defaultScriptsOverride.toString());
+        bool isOverrideScript = it.key().toString().compare(this->_defaultScriptsOverride.toString()) == 0;
         // queue user scripts if restarting
         if (restart && (scriptEngine->isUserLoaded() || isOverrideScript)) {
             _isReloading = true;

From c14b0cd17360adc73561187c10d70c4cc0fd455a Mon Sep 17 00:00:00 2001
From: kasenvr <52365539+kasenvr@users.noreply.github.com>
Date: Fri, 14 Feb 2020 12:10:35 -0500
Subject: [PATCH 19/24] Update README.md

Removed the whitelist instructions as it is no longer enabled by default, we will add documentation for it at a later time.
---
 README.md | 60 +++++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 4f5b3de159..b910b7778f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,17 @@
-# Project Athena
+# Project Athena 
+
+### What is this?
+
+Project Athena is a 3D social software project seeking to incrementally bring about a truly free and open metaverse. (Desktop, VR, XR)
+
+### [Download](https://projectathena.io/download-athena/)
+
+### Releases
+
+#### v0.86.0 K2 (TBD)
+
+##### Features, Bugs, and Housekeeping
+Check out the releases page for more information!
 
 #### v0.86.0 K1 (12/3/19)
 
@@ -9,48 +22,33 @@
 * Entity Script Whitelist, no scripts are whitelisted by default.
 * Background CMD outputs full log, instant close of application on closing of the CMD-line.
 
-#### v0.86.0 K2 (TBD)
-
-##### Features, Bugs, and Housekeeping
-Check out the releases page for more information!
-
-### Whitelist Instructions
-
-The whitelist checks every entity-script attempting to run on your client against a list of domains, their subfolders, or the specific script URL entirely.
-
-The Interface has the whitelist settings under "**Settings -> Entity Script Whitelist**" for you to configure live. The whitelist checks against the domains literally, so you have to be precise to ensure security and functionality. For example, the difference between "http://" and "https://" matters as those will be seen as two different domains in the eyes of the whitelist. Separate each URL by a new line.
-
-Do not use spaces or commas in the whitelist interface, you will only separate by commas and not new lines in the environment variables.
-
-You can also set the Windows environment variable "**EXTRA_WHITELIST**" with your whitelisted domains comma separated like so: "**http://mpassets.highfidelity.com/,https://raw.githubusercontent.com/highfidelity/,https://hifi-content.s3.amazonaws.com/**" 
-
-Alternatively you can make a batch file placed in the same folder as interface.exe that sets the whitelist environment variable temporarily:
-
-```
-set "EXTRA_WHITELIST=http://mpassets.highfidelity.com/,https://raw.githubusercontent.com/highfidelity/,https://hifi-content.s3.amazonaws.com/"
-interface.exe
-```
-
-### How to build interface.exe
+### How to build the Interface
 
 [For Windows](https://github.com/kasenvr/project-athena/blob/kasen/core/BUILD_WIN.md)
+
 [For Linux](https://github.com/kasenvr/project-athena/blob/kasen/core/BUILD_LINUX.md)
 
+[For Linux - Athena Builder](https://github.com/daleglass/athena-builder)
+
 ### Boot to Metaverse: The Goal
 
-Too many of us have our own personal combinations of High Fidelity from C++ modifications to different default scripts, all of which are lost to time as their fullest potential is never truly shared and propagated through the system.
+Having a place to experience adventure, a place to relax with calm breath, that's a world to live in. An engine to support infinite combinations and possibilities of worlds without censorship and interruption, that's a metaverse. Finding a way to make infinite realities our reality, that's the dream.
 
-The goal of this repo is to give a common area to PR the very best of our findings and creations so that we may effectively take each necessary step towards our common goal of living in a true metaverse.
+### Boot to Metaverse: The Technicals
 
-### Why High Fidelity's Engine?
+Many developers have personal combinations of High Fidelity from C++ modifications to different default scripts, all of which are lost to time as their fullest potential is never truly shared and propagated through the system.
 
-Because of all the options, it is the only starting point that is open-source, cross-platform, fully VR integrated + fully desktop integrated with an aim for quality visuals and performance. It also does us the service of providing a foundation to start from such as entity management, full body IK, etc.
+The goal of this project is to achieve the metaverse dream through shared contribution and building. Setting goals that are achievable yet meaningful is key to making proper forward progress on the technical front whilst maintaining morale.
 
-WebXR offers the open-source and decentralized aspect but does not have any of the full featured starting points such as avatars, IK, etc.
+### Why High Fidelity's Virtual Reality Platform?
 
-Platforms like NeosVR or VRChat are unusable from go due to their fundamental closed-source and centralized nature. A metaverse to live on cannot have the keys handed over to any one entity, if any at all.
+Because of all the options, it is the only starting point that is open-source, cross-platform, fully VR integrated + fully desktop integrated with an aim for quality visuals and performance. It also provides a foundation to build from including components like entity management, full body IK, etc.
 
-So the necessary desire is to use High Fidelity as our foundation as a community of one, of all to build a metaverse worth living in.
+WebXR offers the open-source and decentralized aspect but does not have any of the full featured starting points such as avatars, IK, etc. which means that a lot of ground work will have to be laid to make something functional. Far more work will need to be done to create a truly seamless and extensive experience as well.
+
+Platforms like NeosVR or VRChat are not viable from go due to their fundamental closed-source and centralized nature. A metaverse to live in cannot have the keys handed over to any singular entity, if any at all.
+
+We need to do the best we can with what we've got and our best bet as open source developers is to not redesign the wheel if we can help it!
 
 ### Contribution
 

From 1633b2b071975594d91fbe2c62b0002aca036a14 Mon Sep 17 00:00:00 2001
From: kasenvr <52365539+kasenvr@users.noreply.github.com>
Date: Fri, 14 Feb 2020 14:46:19 -0500
Subject: [PATCH 20/24] Update README.md

Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b910b7778f..6891aaeb01 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ### What is this?
 
-Project Athena is a 3D social software project seeking to incrementally bring about a truly free and open metaverse. (Desktop, VR, XR)
+Project Athena is a 3D social software project seeking to incrementally bring about a truly free and open metaverse, in desktop and XR.
 
 ### [Download](https://projectathena.io/download-athena/)
 

From fce37e6bdccd4237c36997999b3875ddd0e45979 Mon Sep 17 00:00:00 2001
From: kasenvr <52365539+kasenvr@users.noreply.github.com>
Date: Fri, 14 Feb 2020 14:46:27 -0500
Subject: [PATCH 21/24] Update README.md

Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6891aaeb01..2f43bb4048 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Check out the releases page for more information!
 
 * Audio Buffer choppy audio bugfix by increasing the buffer size.
 * User Activity Logger disabled, option in code to log the reports to console.
-* CMakeLists.txt configured to work for Polyvox, Interface JSDocs. (may be obsolete)
+* CMakeLists.txt configured to work for Polyvox, Interface JSDocs. (May be obsolete.)
 * Custom Application Title.
 * Entity Script Whitelist, no scripts are whitelisted by default.
 * Background CMD outputs full log, instant close of application on closing of the CMD-line.

From d2f2144e715d3854844bc141443a94327d966a53 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sun, 16 Feb 2020 20:18:12 +1300
Subject: [PATCH 22/24] Update boilerplate in coding standard

---
 CODING_STANDARD.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CODING_STANDARD.md b/CODING_STANDARD.md
index 17f7ecb2f2..fd1843e981 100644
--- a/CODING_STANDARD.md
+++ b/CODING_STANDARD.md
@@ -976,15 +976,18 @@ while (true) {
 
 #### [4.3.4] Source files (header and implementation) must include a boilerplate.
 
-Boilerplates should include the filename, location, creator, copyright, and Apache 2.0 License information and be placed at the top of the file.
+Boilerplates should include the filename, location, creator, copyright Project Athena contributors, and Apache 2.0 License 
+information. This should be placed at the top of the file. If editing an existing file that is copyright High Fidelity, add a 
+second copyright line, copyright Project Athena contributors.
 
 ```cpp
 //
 //  NodeList.h
 //  libraries/shared/src
 //
-//  Created by Stephen Birarda on 2/15/13.
+//  Created by Stephen Birarda on 15 Feb 2013.
 //  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Project Athena contributors.
 //
 //  This is where you could place an optional one line comment about the file.
 //

From 754e57ca7857123cf1db04f708301ccde424caa4 Mon Sep 17 00:00:00 2001
From: kasenvr <52365539+kasenvr@users.noreply.github.com>
Date: Sun, 16 Feb 2020 20:20:04 -0500
Subject: [PATCH 23/24] Update FloofChat.js

Created a chat relay on the metaverse server, grid chat now works again.
---
 scripts/communityModules/chat/FloofChat.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/communityModules/chat/FloofChat.js b/scripts/communityModules/chat/FloofChat.js
index 8028fd95d9..85bc9b42ce 100644
--- a/scripts/communityModules/chat/FloofChat.js
+++ b/scripts/communityModules/chat/FloofChat.js
@@ -44,7 +44,7 @@ var muted = Settings.getValue(settingsRoot + "/muted", {"Local": false, "Domain"
 
 var ws;
 var wsReady = false;
-var WEB_SOCKET_URL = "ws://gridchat.darlingvr.club:8090";  // WebSocket for Grid chat.
+var WEB_SOCKET_URL = "ws://chat.projectathena.io:8880";  // WebSocket for Grid chat.
 var shutdownBool = false;
 
 var defaultColour = {red: 255, green: 255, blue: 255};
@@ -575,4 +575,4 @@ function shutdown() {
     }
     chatBar.close();
     chatHistory.close();
-}
\ No newline at end of file
+}

From 8ab06f5e0e4a413e831338df38e18a00fe827cd9 Mon Sep 17 00:00:00 2001
From: Marcus Llewellyn <marcus.llewellyn@gmail.com>
Date: Wed, 19 Feb 2020 16:37:22 -0600
Subject: [PATCH 24/24] Change to Project Athena in Task Manager

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

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index f800f9c8aa..545d9440e6 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -156,7 +156,7 @@ elseif (WIN32)
   set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
   configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})
 
-  set(APP_FULL_NAME "High Fidelity")
+  set(APP_FULL_NAME "Project Athena")
   set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc")
   configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT})