Merge remote-tracking branch 'upstream/master' into recurse

assignment-client/src/Agent.cpp

@@ -53,6 +53,7 @@
 #include <EntityScriptingInterface.h> // TODO: consider moving to scriptengine.h
 
 #include "entities/AssignmentParentFinder.h"
+#include "AssignmentDynamicFactory.h"
 #include "RecordingScriptingInterface.h"
 #include "AbstractAudioInterface.h"
 #include "AgentScriptingInterface.h"
@@ -67,6 +68,9 @@ Agent::Agent(ReceivedMessage& message) :
 {
     DependencyManager::set<ScriptableAvatar>();
 
+    DependencyManager::registerInheritance<EntityDynamicFactoryInterface, AssignmentDynamicFactory>();
+    DependencyManager::set<AssignmentDynamicFactory>();
+
     DependencyManager::set<AnimationCache>();
     DependencyManager::set<AnimationCacheScriptingInterface>();
     DependencyManager::set<EntityScriptingInterface>(false);
@@ -860,6 +864,8 @@ void Agent::aboutToFinish() {
     DependencyManager::destroy<recording::ClipCache>();
     DependencyManager::destroy<ScriptEngine>();
 
+    DependencyManager::destroy<AssignmentDynamicFactory>();
+
     DependencyManager::destroy<ScriptableAvatar>();
 
     QMetaObject::invokeMethod(&_avatarAudioTimer, "stop");

assignment-client/src/avatars/AvatarMixer.cpp

@@ -541,7 +541,8 @@ void AvatarMixer::handleRequestsDomainListDataPacket(QSharedPointer<ReceivedMess
                     // ...For those nodes, reset the lastBroadcastTime to 0
                     // so that the AvatarMixer will send Identity data to us
                     [&](const SharedNodePointer& node) {
-                    nodeData->setLastBroadcastTime(node->getUUID(), 0);
+                        nodeData->setLastBroadcastTime(node->getUUID(), 0);
+                        nodeData->resetSentTraitData(node->getLocalID());
                 }
                 );
             }
@@ -588,10 +589,10 @@ void AvatarMixer::handleAvatarIdentityRequestPacket(QSharedPointer<ReceivedMessa
     QUuid avatarID(QUuid::fromRfc4122(message->getMessage()) );
     if (!avatarID.isNull()) {
         auto nodeList = DependencyManager::get<NodeList>();
-        auto node = nodeList->nodeWithUUID(avatarID);
+        auto requestedNode = nodeList->nodeWithUUID(avatarID);
-        if (node) {
+
-            QMutexLocker lock(&node->getMutex());
+        if (requestedNode) {
-            AvatarMixerClientData* avatarClientData = dynamic_cast<AvatarMixerClientData*>(node->getLinkedData());
+            AvatarMixerClientData* avatarClientData = static_cast<AvatarMixerClientData*>(requestedNode->getLinkedData());
             if (avatarClientData) {
                 const AvatarData& avatarData = avatarClientData->getAvatar();
                 QByteArray serializedAvatar = avatarData.identityByteArray();
@@ -600,6 +601,11 @@ void AvatarMixer::handleAvatarIdentityRequestPacket(QSharedPointer<ReceivedMessa
                 nodeList->sendPacketList(std::move(identityPackets), *senderNode);
                 ++_sumIdentityPackets;
             }
+
+            AvatarMixerClientData* senderData = static_cast<AvatarMixerClientData*>(senderNode->getLinkedData());
+            if (senderData) {
+                senderData->resetSentTraitData(requestedNode->getLocalID());
+            }
         }
     }
 }
@@ -625,23 +631,24 @@ void AvatarMixer::handleNodeIgnoreRequestPacket(QSharedPointer<ReceivedMessage>
     while (message->getBytesLeftToRead()) {
         // parse out the UUID being ignored from the packet
         QUuid ignoredUUID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
-
+        auto ignoredNode = nodeList->nodeWithUUID(ignoredUUID);
-        if (nodeList->nodeWithUUID(ignoredUUID)) {
+        if (ignoredNode) {
             if (nodeData) {
                 // Reset the lastBroadcastTime for the ignored avatar to 0
                 // so the AvatarMixer knows it'll have to send identity data about the ignored avatar
                 // to the ignorer if the ignorer unignores.
                 nodeData->setLastBroadcastTime(ignoredUUID, 0);
+                nodeData->resetSentTraitData(ignoredNode->getLocalID());
             }
 
 
             // Reset the lastBroadcastTime for the ignorer (FROM THE PERSPECTIVE OF THE IGNORED) to 0
             // so the AvatarMixer knows it'll have to send identity data about the ignorer
             // to the ignored if the ignorer unignores.
-            auto ignoredNode = nodeList->nodeWithUUID(ignoredUUID);
             AvatarMixerClientData* ignoredNodeData = reinterpret_cast<AvatarMixerClientData*>(ignoredNode->getLinkedData());
             if (ignoredNodeData) {
                 ignoredNodeData->setLastBroadcastTime(senderNode->getUUID(), 0);
+                ignoredNodeData->resetSentTraitData(senderNode->getLocalID());
             }
         }
 

assignment-client/src/avatars/AvatarMixerClientData.cpp

@@ -228,6 +228,9 @@ void AvatarMixerClientData::ignoreOther(SharedNodePointer self, SharedNodePointe
             killPacket->writePrimitive(KillAvatarReason::YourAvatarEnteredTheirBubble);
         }
         setLastBroadcastTime(other->getUUID(), 0);
+
+        resetSentTraitData(other->getLocalID());
+
         DependencyManager::get<NodeList>()->sendPacket(std::move(killPacket), *self);
     }
 }
@@ -238,6 +241,11 @@ void AvatarMixerClientData::removeFromRadiusIgnoringSet(SharedNodePointer self,
     }
 }
 
+void AvatarMixerClientData::resetSentTraitData(Node::LocalID nodeLocalID) {
+    _lastSentTraitsTimestamps[nodeLocalID] = TraitsCheckTimestamp();
+    _sentTraitVersions[nodeLocalID].reset();
+}
+
 void AvatarMixerClientData::readViewFrustumPacket(const QByteArray& message) {
     _currentViewFrustums.clear();
 

assignment-client/src/avatars/AvatarMixerClientData.h

@@ -135,6 +135,8 @@ public:
 
     AvatarTraits::TraitVersions& getLastSentTraitVersions(Node::LocalID otherAvatar) { return _sentTraitVersions[otherAvatar]; }
 
+    void resetSentTraitData(Node::LocalID nodeID);
+
 private:
     struct PacketQueue : public std::queue<QSharedPointer<ReceivedMessage>> {
         QWeakPointer<Node> node;

assignment-client/src/entities/EntityTreeSendThread.cpp

@@ -164,7 +164,7 @@ bool EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
         // Send EntityQueryInitialResultsComplete reliable packet ...
         auto initialCompletion = NLPacket::create(PacketType::EntityQueryInitialResultsComplete,
             sizeof(OCTREE_PACKET_SEQUENCE), true);
-        initialCompletion->writePrimitive(OCTREE_PACKET_SEQUENCE(nodeData->getSequenceNumber() - 1U));
+        initialCompletion->writePrimitive(OCTREE_PACKET_SEQUENCE(nodeData->getSequenceNumber()));
         DependencyManager::get<NodeList>()->sendPacket(std::move(initialCompletion), *node);
     }
 

assignment-client/src/scripts/EntityScriptServer.cpp

@@ -24,6 +24,7 @@
 #include <plugins/CodecPlugin.h>
 #include <plugins/PluginManager.h>
 #include <ResourceManager.h>
+#include <ResourceScriptingInterface.h>
 #include <ScriptCache.h>
 #include <ScriptEngines.h>
 #include <SoundCacheScriptingInterface.h>
@@ -32,6 +33,7 @@
 
 #include <EntityScriptClient.h> // for EntityScriptServerServices
 
+#include "../AssignmentDynamicFactory.h"
 #include "EntityScriptServerLogging.h"
 #include "../entities/AssignmentParentFinder.h"
 
@@ -55,7 +57,11 @@ int EntityScriptServer::_entitiesScriptEngineCount = 0;
 EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssignment(message) {
     qInstallMessageHandler(messageHandler);
 
-    DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
+    DependencyManager::registerInheritance<EntityDynamicFactoryInterface, AssignmentDynamicFactory>();
+    DependencyManager::set<AssignmentDynamicFactory>();
+
+    DependencyManager::set<EntityScriptingInterface>(false)->setPacketSender(&_entityEditSender);
+    DependencyManager::set<ResourceScriptingInterface>();
 
     DependencyManager::set<ResourceManager>();
     DependencyManager::set<PluginManager>();
@@ -455,8 +461,11 @@ void EntityScriptServer::resetEntitiesScriptEngine() {
     auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);
     DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);
 
-    disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,
+    if (_entitiesScriptEngine) {
-               this, &EntityScriptServer::updateEntityPPS);
+        disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,
+                   this, &EntityScriptServer::updateEntityPPS);
+    }
+
     _entitiesScriptEngine.swap(newEngine);
     connect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,
             this, &EntityScriptServer::updateEntityPPS);
@@ -487,6 +496,21 @@ void EntityScriptServer::shutdownScriptEngine() {
     _shuttingDown = true;
 
     clear(); // always clear() on shutdown
+
+    auto scriptEngines = DependencyManager::get<ScriptEngines>();
+    scriptEngines->shutdownScripting();
+
+    _entitiesScriptEngine.clear();
+
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    // our entity tree is going to go away so tell that to the EntityScriptingInterface
+    entityScriptingInterface->setEntityTree(nullptr);
+
+    // Should always be true as they are singletons.
+    if (entityScriptingInterface->getPacketSender() == &_entityEditSender) {
+        // The packet sender is about to go away.
+        entityScriptingInterface->setPacketSender(nullptr);
+    }
 }
 
 void EntityScriptServer::addingEntity(const EntityItemID& entityID) {
@@ -559,24 +583,19 @@ void EntityScriptServer::handleOctreePacket(QSharedPointer<ReceivedMessage> mess
 void EntityScriptServer::aboutToFinish() {
     shutdownScriptEngine();
 
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    DependencyManager::destroy<AssignmentDynamicFactory>();
-    // our entity tree is going to go away so tell that to the EntityScriptingInterface
-    entityScriptingInterface->setEntityTree(nullptr);
-
-    // Should always be true as they are singletons.
-    if (entityScriptingInterface->getPacketSender() == &_entityEditSender) {
-        // The packet sender is about to go away.
-        entityScriptingInterface->setPacketSender(nullptr);
-    }
-
     DependencyManager::destroy<AssignmentParentFinder>();
 
     DependencyManager::get<ResourceManager>()->cleanup();
 
     DependencyManager::destroy<PluginManager>();
 
+    DependencyManager::destroy<ResourceScriptingInterface>();
+    DependencyManager::destroy<EntityScriptingInterface>();
+
     // cleanup the AudioInjectorManager (and any still running injectors)
     DependencyManager::destroy<AudioInjectorManager>();
+
     DependencyManager::destroy<ScriptEngines>();
     DependencyManager::destroy<EntityScriptServerServices>();
 

interface/resources/qml/LoginDialog/LinkAccountBody.qml

@@ -120,6 +120,7 @@ Item {
 
         TextField {
             id: usernameField
+            text: Settings.getValue("wallet/savedUsername", "");
             width: parent.width
             focus: true
             label: "Username or Email"

interface/resources/qml/Stats.qml

@@ -127,10 +127,10 @@ Item {
                     StatText {
                         visible: root.expanded
                         text: "Intersection calls: Entities/Overlays/Avatars/HUD\n    " +
-                                    root.stylusPicksUpdated.x + "/" + root.stylusPicksUpdated.y + "/" + root.stylusPicksUpdated.z + "/" + root.stylusPicksUpdated.w + "\n    " +
+                                    "Styluses:\t" + root.stylusPicksUpdated.x + "/" + root.stylusPicksUpdated.y + "/" + root.stylusPicksUpdated.z + "/" + root.stylusPicksUpdated.w + "\n    " +
-                                    root.rayPicksUpdated.x + "/" + root.rayPicksUpdated.y + "/" + root.rayPicksUpdated.z + "/" + root.rayPicksUpdated.w + "\n    " +
+                                    "Rays:\t" + root.rayPicksUpdated.x + "/" + root.rayPicksUpdated.y + "/" + root.rayPicksUpdated.z + "/" + root.rayPicksUpdated.w + "\n    " +
-                                    root.parabolaPicksUpdated.x + "/" + root.parabolaPicksUpdated.y + "/" + root.parabolaPicksUpdated.z + "/" + root.parabolaPicksUpdated.w + "\n    " +
+                                    "Parabolas:\t" + root.parabolaPicksUpdated.x + "/" + root.parabolaPicksUpdated.y + "/" + root.parabolaPicksUpdated.z + "/" + root.parabolaPicksUpdated.w + "\n    " +
-                                    root.collisionPicksUpdated.x + "/" + root.collisionPicksUpdated.y + "/" + root.collisionPicksUpdated.z + "/" + root.collisionPicksUpdated.w
+                                    "Colliders:\t" + root.collisionPicksUpdated.x + "/" + root.collisionPicksUpdated.y + "/" + root.collisionPicksUpdated.z + "/" + root.collisionPicksUpdated.w
                     }
                 }
             }

interface/resources/qml/hifi/commerce/wallet/Help.qml

@@ -63,47 +63,6 @@ Item {
             question: "How can I get HFC?";
             answer: "High Fidelity commerce is in open beta right now. Want more HFC? \
 Get it by going to <br><br><b><font color='#0093C5'><a href='#bank'>BankOfHighFidelity.</a></font></b> and meeting with the banker!";
-        }
-        ListElement {
-            isExpanded: false;
-            question: "What are private keys and where are they stored?";
-            answer: 
-                "A private key is a secret piece of text that is used to prove ownership, unlock confidential information, and sign transactions. \
-In High Fidelity, your private key is used to securely access the contents of your Wallet and Purchases. \
-After wallet setup, a hifikey file is stored on your computer in High Fidelity Interface's AppData directory. \
-Your hifikey file contains your private key and is protected by your wallet passphrase. \
-<br><br>It is very important to back up your hifikey file! \
-<b><font color='#0093C5'><a href='#privateKeyPath'>Tap here to open the folder where your HifiKeys are stored on your main display.</a></font></b>"
-        }
-        ListElement {
-            isExpanded: false;
-            question: "How do I back up my private keys?";
-            answer: "You can back up your hifikey file (which contains your private key and is encrypted using your wallet passphrase) by copying it to a USB flash drive, or to a service like Dropbox or Google Drive. \
-Restore your hifikey file by replacing the file in Interface's AppData directory with your backup copy. \
-Others with access to your back up should not be able to spend your HFC without your passphrase. \
-<b><font color='#0093C5'><a href='#privateKeyPath'>Tap here to open the folder where your HifiKeys are stored on your main display.</a></font></b>";
-        }
-        ListElement {
-            isExpanded: false;
-            question: "What happens if I lose my private keys?";
-            answer: "We cannot stress enough that you should keep a backup! For security reasons, High Fidelity does not keep a copy, and cannot restore it for you. \
-If you lose your private key, you will no longer have access to the contents of your Wallet or My Purchases. \
-Here are some things to try:<ul>\
-<li>If you have backed up your hifikey file before, search your backup location</li>\
-<li>Search your AppData directory in the last machine you used to set up the Wallet</li>\
-<li>If you are a developer and have installed multiple builds of High Fidelity, your hifikey file might be in another folder</li>\
-</ul><br><br>As a last resort, you can set up your Wallet again and generate a new hifikey file. \
-Unfortunately, this means you will start with 0 HFC and your purchased items will not be transferred over.";
-        }
-        ListElement {
-            isExpanded: false;
-            question: "What if I forget my wallet passphrase?";
-            answer: "Your wallet passphrase is used to encrypt your private keys. Please write it down and store it securely! \
-<br><br>If you forget your passphrase, you will no longer be able to decrypt the hifikey file that the passphrase protects. \
-You will also no longer have access to the contents of your Wallet or My Purchases. \
-For security reasons, High Fidelity does not keep a copy of your passphrase, and can't restore it for you. \
-<br><br>If you still cannot remember your wallet passphrase, you can set up your Wallet again and generate a new hifikey file. \
-Unfortunately, this means you will start with 0 HFC and your purchased items will not be transferred over.";
         }
         ListElement {
             isExpanded: false;
@@ -114,11 +73,9 @@ In your Wallet's Send Money tab, choose from your list of connections, or choose
         ListElement {
             isExpanded: false;
             question: "What is a Security Pic?"
-            answer: "Your Security Pic is an encrypted image that you select during Wallet Setup. \
+            answer: "Your Security Pic acts as an extra layer of Wallet security. \
-It acts as an extra layer of Wallet security. \
+When you see your Security Pic, you know that your actions and data are securely making use of your account. \
-When you see your Security Pic, you know that your actions and data are securely making use of your private keys.\
+<br><br><b><font color='#0093C5'><a href='#securitypic'>Tap here to change your Security Pic.</a></font></b>";
-<br><br>Don't enter your passphrase anywhere that doesn't display your Security Pic! \
-If you don't see your Security Pic on a page that requests your Wallet passphrase, someone untrustworthy may be trying to access your Wallet.";
         }
         ListElement {
             isExpanded: false;
@@ -260,6 +217,8 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                             }
                         } else if (link === "#support") {
                             Qt.openUrlExternally("mailto:support@highfidelity.com");
+                        } else if (link === "#securitypic") {
+                            sendSignalToWallet({method: 'walletSecurity_changeSecurityImage'});
                         }
                     }
                 }

interface/resources/qml/hifi/commerce/wallet/Security.qml

@@ -88,76 +88,9 @@ Item {
             color: hifi.colors.faintGray;
         }
 
-        Item {
-            id: changePassphraseContainer;
-            anchors.top: securityTextSeparator.bottom;
-            anchors.topMargin: 8;
-            anchors.left: parent.left;
-            anchors.leftMargin: 40;
-            anchors.right: parent.right;
-            anchors.rightMargin: 55;
-            height: 75;
-
-            HiFiGlyphs {
-                id: changePassphraseImage;
-                text: hifi.glyphs.passphrase;
-                // Size
-                size: 80;
-                // Anchors
-                anchors.top: parent.top;
-                anchors.bottom: parent.bottom;
-                anchors.left: parent.left;
-                // Style
-                color: hifi.colors.white;
-            }
-
-            RalewaySemiBold {
-                text: "Passphrase";
-                // Anchors
-                anchors.top: parent.top;
-                anchors.bottom: parent.bottom;
-                anchors.left: changePassphraseImage.right;
-                anchors.leftMargin: 30;
-                width: 50;
-                // Text size
-                size: 18;
-                // Style
-                color: hifi.colors.white;
-            }
-
-            // "Change Passphrase" button
-            HifiControlsUit.Button {
-                id: changePassphraseButton;
-                color: hifi.buttons.blue;
-                colorScheme: hifi.colorSchemes.dark;
-                anchors.right: parent.right;
-                anchors.verticalCenter: parent.verticalCenter;
-                width: 140;
-                height: 40;
-                text: "Change";
-                onClicked: {
-                    sendSignalToWallet({method: 'walletSecurity_changePassphrase'});
-                }
-            }
-        }
-
-        Rectangle {
-            id: changePassphraseSeparator;
-            // Size
-            width: parent.width;
-            height: 1;
-            // Anchors
-            anchors.left: parent.left;
-            anchors.right: parent.right;
-            anchors.top: changePassphraseContainer.bottom;
-            anchors.topMargin: 8;
-            // Style
-            color: hifi.colors.faintGray;
-        }
-
         Item {
             id: changeSecurityImageContainer;
-            anchors.top: changePassphraseSeparator.bottom;
+            anchors.top: securityTextSeparator.bottom;
             anchors.topMargin: 8;
             anchors.left: parent.left;
             anchors.leftMargin: 40;
@@ -208,139 +141,77 @@ Item {
             }
         }
 
-        Rectangle {
+        Item {
-            id: privateKeysSeparator;
+            id: autoLogoutContainer;
-            // Size
-            width: parent.width;
-            height: 1;
-            // Anchors
-            anchors.left: parent.left;
-            anchors.right: parent.right;
             anchors.top: changeSecurityImageContainer.bottom;
             anchors.topMargin: 8;
-            // Style
-            color: hifi.colors.faintGray;
-        }
-
-        Item {
-            id: yourPrivateKeysContainer;
-            anchors.top: privateKeysSeparator.bottom;
             anchors.left: parent.left;
             anchors.leftMargin: 40;
             anchors.right: parent.right;
             anchors.rightMargin: 55;
-            anchors.bottom: parent.bottom;
+            height: 75;
 
-            onVisibleChanged: {
+            HiFiGlyphs {	
-                if (visible) {
+                id: autoLogoutImage;	
-                    Commerce.getKeyFilePathIfExists();
+                text: hifi.glyphs.walletKey;	
-                }
+                // Size	
+                size: 80;	
+                // Anchors	
+                anchors.top: parent.top;	
+                anchors.topMargin: 20;	
+                anchors.left: parent.left;	
+                // Style	
+                color: hifi.colors.white;	
             }
 
-            HiFiGlyphs {
+            HifiControlsUit.CheckBox {
-                id: yourPrivateKeysImage;
+                id: autoLogoutCheckbox;
-                text: hifi.glyphs.walletKey;
+                checked: Settings.getValue("wallet/autoLogout", false);
-                // Size
+                text: "Automatically Log Out when Exiting Interface"
-                size: 80;
                 // Anchors
-                anchors.top: parent.top;
+                anchors.verticalCenter: autoLogoutImage.verticalCenter;
-                anchors.topMargin: 20;
+                anchors.left: autoLogoutImage.right;
-                anchors.left: parent.left;
+                anchors.leftMargin: 20;
-                // Style
+                anchors.right: autoLogoutHelp.left;
+                anchors.rightMargin: 12;
+                boxSize: 28;
+                labelFontSize: 18;
                 color: hifi.colors.white;
+                onCheckedChanged: {
+                    Settings.setValue("wallet/autoLogout", checked);
+                    if (checked) {
+                        Settings.setValue("wallet/savedUsername", Account.username);
+                    } else {
+                        Settings.setValue("wallet/savedUsername", "");
+                    }
+                }
             }
 
             RalewaySemiBold {
-                id: yourPrivateKeysText;
+                id: autoLogoutHelp;
-                text: "Private Keys";
+                text: '[?]';
-                size: 18;
                 // Anchors
-                anchors.top: parent.top;
+                anchors.verticalCenter: autoLogoutImage.verticalCenter;
-                anchors.topMargin: 32;
-                anchors.left: yourPrivateKeysImage.right;
-                anchors.leftMargin: 30;
                 anchors.right: parent.right;
+                width: 30;
                 height: 30;
-                // Style
-                color: hifi.colors.white;
-            }
-
-            // Text below "private keys"
-            RalewayRegular {
-                id: explanitoryText;
-                text: "Your money and purchases are secured with private keys that only you have access to.";
                 // Text size
                 size: 18;
-                // Anchors
-                anchors.top: yourPrivateKeysText.bottom;
-                anchors.topMargin: 10;
-                anchors.left: yourPrivateKeysText.left;
-                anchors.right: yourPrivateKeysText.right;
-                height: paintedHeight;
                 // Style
-                color: hifi.colors.white;
+                color: hifi.colors.blueHighlight;
-                wrapMode: Text.WordWrap;
-                // Alignment
-                horizontalAlignment: Text.AlignLeft;
-                verticalAlignment: Text.AlignVCenter;
-            }
 
-            Rectangle {
-                id: removeHmdContainer;
-                z: 998;
-                visible: false;
-
-                gradient: Gradient {
-                    GradientStop {
-                        position: 0.2;
-                        color: hifi.colors.baseGrayHighlight;
-                    }
-                    GradientStop {
-                        position: 1.0;
-                        color: hifi.colors.baseGrayShadow;
-                    }
-                }
-                anchors.fill: backupInstructionsButton;
-                radius: 5;
                 MouseArea {
                     anchors.fill: parent;
-                    propagateComposedEvents: false;
                     hoverEnabled: true;
-                }
+                    onEntered: {
-
+                        parent.color = hifi.colors.blueAccent;
-                RalewayBold {
+                    }
-                    anchors.fill: parent;
+                    onExited: {
-                    text: "INSTRUCTIONS OPEN ON DESKTOP";
+                        parent.color = hifi.colors.blueHighlight;
-                    size: 15;
+                    }
-                    color: hifi.colors.white;
+                    onClicked: {
-                    verticalAlignment: Text.AlignVCenter;
+                        sendSignalToWallet({method: 'walletSecurity_autoLogoutHelp'});
-                    horizontalAlignment: Text.AlignHCenter;
-                }
-
-                    Timer {
-                        id: removeHmdContainerTimer;
-                        interval: 5000;
-                        onTriggered: removeHmdContainer.visible = false
                     }
-            }
-
-            HifiControlsUit.Button {
-                id: backupInstructionsButton;
-                text: "View Backup Instructions";
-                color: hifi.buttons.blue;
-                colorScheme: hifi.colorSchemes.dark;
-                anchors.left: explanitoryText.left;
-                anchors.right: explanitoryText.right;
-                anchors.top: explanitoryText.bottom;
-                anchors.topMargin: 16;
-                height: 40;
-
-                onClicked: {
-                    var keyPath = "file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/'));
-                    Qt.openUrlExternally(keyPath + "/backup_instructions.html");
-                    Qt.openUrlExternally(keyPath);
-                    removeHmdContainer.visible = true;
-                    removeHmdContainerTimer.start();
                 }
             }
         }

interface/resources/qml/hifi/commerce/wallet/Wallet.qml

@@ -382,6 +382,17 @@ Rectangle {
                 } else if (msg.method === 'walletSecurity_changeSecurityImage') {
                     securityImageChange.initModel();
                     root.activeView = "securityImageChange";
+                } else if (msg.method === 'walletSecurity_autoLogoutHelp') {
+                    lightboxPopup.titleText = "Automatically Log Out";
+                    lightboxPopup.bodyText = "By default, after you log in to High Fidelity, you will stay logged in to your High Fidelity " +
+                        "account even after you close and re-open Interface. This means anyone who opens Interface on your computer " +
+                        "could make purchases with your Wallet.\n\n" +
+                        "If you do not want to stay logged in across Interface sessions, check this box.";
+                    lightboxPopup.button1text = "CLOSE";
+                    lightboxPopup.button1method = function() {
+                        lightboxPopup.visible = false;
+                    }
+                    lightboxPopup.visible = true;
                 }
             }
         }
@@ -399,6 +410,9 @@ Rectangle {
             onSendSignalToWallet: {
                 if (msg.method === 'walletReset' || msg.method === 'passphraseReset') {
                     sendToScript(msg);
+                } else if (msg.method === 'walletSecurity_changeSecurityImage') {
+                    securityImageChange.initModel();
+                    root.activeView = "securityImageChange";
                 }
             }
         }
@@ -803,12 +817,24 @@ Rectangle {
     }
 
     function walletResetSetup() {
+        /* Bypass all this and do it automatically
         root.activeView = "walletSetup";
         var timestamp = new Date();
         walletSetup.startingTimestamp = timestamp;
         walletSetup.setupAttemptID = generateUUID();
         UserActivityLogger.commerceWalletSetupStarted(timestamp, walletSetup.setupAttemptID, walletSetup.setupFlowVersion, walletSetup.referrer ? walletSetup.referrer : "wallet app",
             (AddressManager.placename || AddressManager.hostname || '') + (AddressManager.pathname ? AddressManager.pathname.match(/\/[^\/]+/)[0] : ''));
+            */
+
+        var randomNumber = Math.floor(Math.random() * 34) + 1;
+        var securityImagePath = "images/" + addLeadingZero(randomNumber) + ".jpg";
+        Commerce.getWalletAuthenticatedStatus(); // before writing security image, ensures that salt/account password is set.
+        Commerce.chooseSecurityImage(securityImagePath);
+        Commerce.generateKeyPair();
+    }
+
+    function addLeadingZero(n) {
+        return n < 10 ? '0' + n : '' + n;
     }
 
     function followReferrer(msg) {

interface/src/Application.cpp

@@ -375,6 +375,7 @@ static const int INTERVAL_TO_CHECK_HMD_WORN_STATUS = 500; // milliseconds
 static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop";
 static const QString ACTIVE_DISPLAY_PLUGIN_SETTING_NAME = "activeDisplayPlugin";
 static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system";
+static const QString AUTO_LOGOUT_SETTING_NAME = "wallet/autoLogout";
 
 const std::vector<std::pair<QString, Application::AcceptURLMethod>> Application::_acceptedExtensions {
     { SVO_EXTENSION, &Application::importSVOFromURL },
@@ -1730,6 +1731,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     QTimer* settingsTimer = new QTimer();
     moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{
         connect(qApp, &Application::beforeAboutToQuit, [this, settingsTimer]{
+            bool autoLogout = Setting::Handle<bool>(AUTO_LOGOUT_SETTING_NAME, false).get();
+            if (autoLogout) {
+                auto accountManager = DependencyManager::get<AccountManager>();
+                accountManager->logout();
+            }
             // Disconnect the signal from the save settings
             QObject::disconnect(settingsTimer, &QTimer::timeout, this, &Application::saveSettings);
             // Stop the settings timer
@@ -3659,7 +3665,7 @@ bool Application::event(QEvent* event) {
 
 bool Application::eventFilter(QObject* object, QEvent* event) {
 
-    if (_aboutToQuit) {
+    if (_aboutToQuit && event->type() != QEvent::DeferredDelete && event->type() != QEvent::Destroy) {
         return true;
     }
 

interface/src/avatar/MyAvatar.cpp

@@ -105,7 +105,7 @@ MyAvatar::MyAvatar(QThread* thread) :
     _eyeContactTarget(LEFT_EYE),
     _realWorldFieldOfView("realWorldFieldOfView",
                           DEFAULT_REAL_WORLD_FIELD_OF_VIEW_DEGREES),
-    _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", false),
+    _useAdvancedMovementControls("advancedMovementForHandControllersIsChecked", true),
     _smoothOrientationTimer(std::numeric_limits<float>::max()),
     _smoothOrientationInitial(),
     _smoothOrientationTarget(),
@@ -203,6 +203,7 @@ MyAvatar::MyAvatar(QThread* thread) :
 
     connect(recorder.data(), &Recorder::recordingStateChanged, [=] {
         if (recorder->isRecording()) {
+            createRecordingIDs();
             setRecordingBasis();
         } else {
             clearRecordingBasis();
@@ -444,7 +445,6 @@ void MyAvatar::reset(bool andRecenter, bool andReload, bool andHead) {
 }
 
 void MyAvatar::update(float deltaTime) {
-
     // update moving average of HMD facing in xz plane.
     const float HMD_FACING_TIMESCALE = getRotationRecenterFilterLength();
 

interface/src/commerce/Ledger.cpp

@@ -31,7 +31,9 @@
 QJsonObject Ledger::apiResponse(const QString& label, QNetworkReply* reply) {
     QByteArray response = reply->readAll();
     QJsonObject data = QJsonDocument::fromJson(response).object();
+#if defined(DEV_BUILD)  // Don't expose user's personal data in the wild. But during development this can be handy.
     qInfo(commerce) << label << "response" << QJsonDocument(data).toJson(QJsonDocument::Compact);
+#endif
     return data;
 }
 // Non-200 responses are not json:
@@ -69,7 +71,9 @@ void Ledger::send(const QString& endpoint, const QString& success, const QString
     auto accountManager = DependencyManager::get<AccountManager>();
     const QString URL = "/api/v1/commerce/";
     JSONCallbackParameters callbackParams(this, success, fail);
+#if defined(DEV_BUILD)  // Don't expose user's personal data in the wild. But during development this can be handy.
     qCInfo(commerce) << "Sending" << endpoint << QJsonDocument(request).toJson(QJsonDocument::Compact);
+#endif
     accountManager->sendRequest(URL + endpoint,
         authType,
         method,
@@ -117,7 +121,7 @@ void Ledger::buy(const QString& hfc_key, int cost, const QString& asset_id, cons
     signedSend("transaction", transactionString, hfc_key, "buy", "buySuccess", "buyFailure", controlled_failure);
 }
 
-bool Ledger::receiveAt(const QString& hfc_key, const QString& signing_key) {
+bool Ledger::receiveAt(const QString& hfc_key, const QString& signing_key, const QByteArray& locker) {
     auto accountManager = DependencyManager::get<AccountManager>();
     if (!accountManager->isLoggedIn()) {
         qCWarning(commerce) << "Cannot set receiveAt when not logged in.";
@@ -125,11 +129,25 @@ bool Ledger::receiveAt(const QString& hfc_key, const QString& signing_key) {
         emit receiveAtResult(result);
         return false; // We know right away that we will fail, so tell the caller.
     }
-
+    QJsonObject transaction;
-    signedSend("public_key", hfc_key.toUtf8(), signing_key, "receive_at", "receiveAtSuccess", "receiveAtFailure");
+    transaction["public_key"] = hfc_key;
+    transaction["locker"] = QString::fromUtf8(locker);
+    QJsonDocument transactionDoc{ transaction };
+    auto transactionString = transactionDoc.toJson(QJsonDocument::Compact);
+    signedSend("text", transactionString, signing_key, "receive_at", "receiveAtSuccess", "receiveAtFailure");
     return true; // Note that there may still be an asynchronous signal of failure that callers might be interested in.
 }
 
+bool Ledger::receiveAt() {
+    auto wallet = DependencyManager::get<Wallet>();
+    auto keys = wallet->listPublicKeys();
+    if (keys.isEmpty()) {
+        return false;
+    }
+    auto key = keys.first();
+    return receiveAt(key, key, wallet->getWallet());
+}
+
 void Ledger::balance(const QStringList& keys) {
     keysQuery("balance", "balanceSuccess", "balanceFailure");
 }
@@ -283,24 +301,30 @@ void Ledger::accountSuccess(QNetworkReply* reply) {
     auto iv = QByteArray::fromBase64(data["iv"].toString().toUtf8());
     auto ckey = QByteArray::fromBase64(data["ckey"].toString().toUtf8());
     QString remotePublicKey = data["public_key"].toString();
+    const QByteArray locker = data["locker"].toString().toUtf8();
     bool isOverride = wallet->wasSoftReset();
 
     wallet->setSalt(salt);
     wallet->setIv(iv);
     wallet->setCKey(ckey);
+    if (!locker.isEmpty()) {
+        wallet->setWallet(locker);
+        wallet->setPassphrase("ACCOUNT"); // We only locker wallets that have been converted to account-based auth.
+    }
 
     QString keyStatus = "ok";
     QStringList localPublicKeys = wallet->listPublicKeys();
     if (remotePublicKey.isEmpty() || isOverride) {
-        if (!localPublicKeys.isEmpty()) {
+        if (!localPublicKeys.isEmpty()) { // Let the metaverse know about a local wallet.
-            QString key = localPublicKeys.first();
+            receiveAt();
-            receiveAt(key, key);
         }
     } else {
         if (localPublicKeys.isEmpty()) {
             keyStatus = "preexisting";
         } else if (localPublicKeys.first() != remotePublicKey) {
             keyStatus = "conflicting";
+        } else if (locker.isEmpty()) { // Matches metaverse data, but we haven't lockered it yet.
+            receiveAt();
         }
     }
 

interface/src/commerce/Ledger.h

@@ -26,7 +26,8 @@ class Ledger : public QObject, public Dependency {
 
 public:
     void buy(const QString& hfc_key, int cost, const QString& asset_id, const QString& inventory_key, const bool controlled_failure = false);
-    bool receiveAt(const QString& hfc_key, const QString& signing_key);
+    bool receiveAt(const QString& hfc_key, const QString& signing_key, const QByteArray& locker);
+    bool receiveAt();
     void balance(const QStringList& keys);
     void inventory(const QString& editionFilter, const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage);
     void history(const QStringList& keys, const int& pageNumber, const int& itemsPerPage);

interface/src/commerce/Wallet.cpp

@@ -131,7 +131,7 @@ bool Wallet::writeBackupInstructions() {
     QFile outputFile(outputFilename);
     bool retval = false;
 
-    if (getKeyFilePath() == "")
+    if (getKeyFilePath().isEmpty())
     {
         return false;
     }
@@ -190,6 +190,30 @@ bool writeKeys(const char* filename, EC_KEY* keys) {
     return retval;
 }
 
+bool Wallet::setWallet(const QByteArray& wallet) {
+    QFile file(keyFilePath());
+    if (!file.open(QIODevice::WriteOnly)) {
+        qCCritical(commerce) << "Unable to open wallet for write in" << keyFilePath();
+        return false;
+    }
+    if (file.write(wallet) != wallet.count()) {
+        qCCritical(commerce) << "Unable to write wallet in" << keyFilePath();
+        return false;
+    }
+    file.close();
+    return true;
+}
+QByteArray Wallet::getWallet() {
+    QFile file(keyFilePath());
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCInfo(commerce) << "No existing wallet in" << keyFilePath();
+        return QByteArray();
+    }
+    QByteArray wallet = file.readAll();
+    file.close();
+    return wallet;
+}
+
 QPair<QByteArray*, QByteArray*> generateECKeypair() {
 
     EC_KEY* keyPair = EC_KEY_new_by_curve_name(NID_secp256k1);
@@ -334,7 +358,7 @@ Wallet::Wallet() {
         uint status;
         QString keyStatus = result.contains("data") ? result["data"].toObject()["keyStatus"].toString() : "";
 
-        if (wallet->getKeyFilePath() == "" || !wallet->getSecurityImage()) {
+        if (wallet->getKeyFilePath().isEmpty() || !wallet->getSecurityImage()) {
             if (keyStatus == "preexisting") {
                 status = (uint) WalletStatus::WALLET_STATUS_PREEXISTING;
             } else{
@@ -524,15 +548,23 @@ bool Wallet::walletIsAuthenticatedWithPassphrase() {
 
     // FIXME: initialize OpenSSL elsewhere soon
     initialize();
+    qCDebug(commerce) << "walletIsAuthenticatedWithPassphrase: checking" << (!_passphrase || !_passphrase->isEmpty());
 
     // this should always be false if we don't have a passphrase
     // cached yet
     if (!_passphrase || _passphrase->isEmpty()) {
-        return false;
+        if (!getKeyFilePath().isEmpty()) { // If file exists, then it is an old school file that has not been lockered. Must get user's passphrase.
+            qCDebug(commerce) << "walletIsAuthenticatedWithPassphrase: No passphrase, but there is an existing wallet.";
+            return false;
+        } else {
+            qCDebug(commerce) << "walletIsAuthenticatedWithPassphrase: New setup.";
+            setPassphrase("ACCOUNT"); // Going forward, consider this an account-based client.
+        }
     }
     if (_publicKeys.count() > 0) {
         // we _must_ be authenticated if the publicKeys are there
         DependencyManager::get<WalletScriptingInterface>()->setWalletStatus((uint)WalletStatus::WALLET_STATUS_READY);
+        qCDebug(commerce) << "walletIsAuthenticatedWithPassphrase: wallet was ready";
         return true;
     }
 
@@ -545,10 +577,15 @@ bool Wallet::walletIsAuthenticatedWithPassphrase() {
 
             // be sure to add the public key so we don't do this over and over
             _publicKeys.push_back(publicKey.toBase64());
+
+            if (*_passphrase != "ACCOUNT") {
+                changePassphrase("ACCOUNT"); // Rewrites with salt and constant, and will be lockered that way.
+            }
+            qCDebug(commerce) << "walletIsAuthenticatedWithPassphrase: wallet now ready";
             return true;
         }
     }
-
+    qCDebug(commerce) << "walletIsAuthenticatedWithPassphrase: wallet not ready";
     return false;
 }
 
@@ -559,6 +596,7 @@ bool Wallet::generateKeyPair() {
     qCInfo(commerce) << "Generating keypair.";
     auto keyPair = generateECKeypair();
     if (!keyPair.first) {
+        qCWarning(commerce) << "Empty keypair";
         return false;
     }
 
@@ -576,7 +614,7 @@ bool Wallet::generateKeyPair() {
     // 2. It is maximally private, and we can step back from that later if desired.
     // 3. It maximally exercises all the machinery, so we are most likely to surface issues now.
     auto ledger = DependencyManager::get<Ledger>();
-    return ledger->receiveAt(key, key);
+    return ledger->receiveAt(key, key, getWallet());
 }
 
 QStringList Wallet::listPublicKeys() {
@@ -666,11 +704,13 @@ void Wallet::chooseSecurityImage(const QString& filename) {
     // there _is_ a keyfile, we need to update it (similar to changing the
     // passphrase, we need to do so into a temp file and move it).
     if (!QFile(keyFilePath()).exists()) {
+        qCDebug(commerce) << "initial security pic set for empty wallet";
         emit securityImageResult(true);
         return;
     }
 
     bool success = writeWallet();
+    qCDebug(commerce) << "updated security pic" << success;
     emit securityImageResult(success);
 }
 
@@ -715,6 +755,11 @@ QString Wallet::getKeyFilePath() {
 
 bool Wallet::writeWallet(const QString& newPassphrase) {
     EC_KEY* keys = readKeys(keyFilePath().toStdString().c_str());
+    auto ledger = DependencyManager::get<Ledger>();
+    // Remove any existing locker, because it will be out of date.
+    if (!_publicKeys.isEmpty() && !ledger->receiveAt(_publicKeys.first(), _publicKeys.first(), QByteArray())) {
+        return false;  // FIXME: receiveAt could fail asynchronously.
+    }
     if (keys) {
         // we read successfully, so now write to a new temp file
         QString tempFileName = QString("%1.%2").arg(keyFilePath(), QString("temp"));
@@ -722,6 +767,7 @@ bool Wallet::writeWallet(const QString& newPassphrase) {
         if (!newPassphrase.isEmpty()) {
             setPassphrase(newPassphrase);
         }
+
         if (writeKeys(tempFileName.toStdString().c_str(), keys)) {
             if (writeSecurityImage(_securityImage, tempFileName)) {
                 // ok, now move the temp file to the correct spot
@@ -729,6 +775,11 @@ bool Wallet::writeWallet(const QString& newPassphrase) {
                 QFile(tempFileName).rename(QString(keyFilePath()));
                 qCDebug(commerce) << "wallet written successfully";
                 emit keyFilePathIfExistsResult(getKeyFilePath());
+                if (!walletIsAuthenticatedWithPassphrase() || !ledger->receiveAt()) {
+                    // FIXME: Should we fail the whole operation?
+                    // Tricky, because we'll need the the key and file from the TEMP location...
+                    qCWarning(commerce) << "Failed to update locker";
+                }
                 return true;
             } else {
                 qCDebug(commerce) << "couldn't write security image to temp wallet";

interface/src/commerce/Wallet.h

@@ -73,6 +73,7 @@ private slots:
     void handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> packet, SharedNodePointer sendingNode);
 
 private:
+    friend class Ledger;
     QStringList _publicKeys{};
     QPixmap* _securityImage { nullptr };
     QByteArray _salt;
@@ -87,6 +88,9 @@ private:
     bool readSecurityImage(const QString& inputFilePath, unsigned char** outputBufferPtr, int* outputBufferLen);
     bool writeBackupInstructions();
 
+    bool setWallet(const QByteArray& wallet);
+    QByteArray getWallet();
+
     void account();
 };
 

interface/src/octree/SafeLanding.cpp

@@ -122,11 +122,11 @@ bool SafeLanding::isSequenceNumbersComplete() {
         int sequenceSize = _initialStart <= _initialEnd ? _initialEnd - _initialStart:
                 _initialEnd + SEQUENCE_MODULO - _initialStart;
         auto startIter = _sequenceNumbers.find(_initialStart);
-        auto endIter = _sequenceNumbers.find(_initialEnd);
+        auto endIter = _sequenceNumbers.find(_initialEnd - 1);
         if (sequenceSize == 0 ||
             (startIter != _sequenceNumbers.end()
             && endIter != _sequenceNumbers.end()
-            && distance(startIter, endIter) == sequenceSize) ) {
+            && distance(startIter, endIter) == sequenceSize - 1) ) {
             _trackingEntities = false; // Don't track anything else that comes in.
             return true;
         }

interface/src/octree/SafeLanding.h

@@ -26,7 +26,7 @@ class SafeLanding : public QObject {
 public:
     void startEntitySequence(QSharedPointer<EntityTreeRenderer> entityTreeRenderer);
     void stopEntitySequence();
-    void setCompletionSequenceNumbers(int first, int last);
+    void setCompletionSequenceNumbers(int first, int last);  // 'last' exclusive.
     void noteReceivedsequenceNumber(int sequenceNumber);
     bool isLoadSequenceComplete();
 

interface/src/ui/PreferencesDialog.cpp

@@ -272,7 +272,7 @@ void setupPreferences() {
         auto getter = [myAvatar]()->bool { return myAvatar->useAdvancedMovementControls(); };
         auto setter = [myAvatar](bool value) { myAvatar->setUseAdvancedMovementControls(value); };
         preferences->addPreference(new CheckPreference(VR_MOVEMENT,
-                                                       QStringLiteral("Advanced movement for hand controllers"),
+                                                       QStringLiteral("Advanced movement in VR (Teleport movement when unchecked)"),
                                                        getter, setter));
     }
     {

libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp

@@ -376,6 +376,9 @@ void Avatar::updateAvatarEntities() {
                 }
             }
         }
+        if (avatarEntities.size() != _avatarEntityForRecording.size()) {
+            createRecordingIDs();
+        }
     });
 
     setAvatarEntityDataChanged(false);

libraries/avatars/src/AvatarData.cpp

@@ -2308,6 +2308,15 @@ void AvatarData::setRecordingBasis(std::shared_ptr<Transform> recordingBasis) {
     _recordingBasis = recordingBasis;
 }
 
+void AvatarData::createRecordingIDs() {
+    _avatarEntitiesLock.withReadLock([&] {
+        _avatarEntityForRecording.clear();
+        for (int i = 0; i < _avatarEntityData.size(); i++) {
+            _avatarEntityForRecording.insert(QUuid::createUuid());
+        }
+    });
+}
+
 void AvatarData::clearRecordingBasis() {
     _recordingBasis.reset();
 }
@@ -2368,21 +2377,15 @@ QJsonObject AvatarData::toJson() const {
     if (!getDisplayName().isEmpty()) {
         root[JSON_AVATAR_DISPLAY_NAME] = getDisplayName();
     }
-    if (!getAttachmentData().isEmpty()) {
-        QJsonArray attachmentsJson;
-        for (auto attachment : getAttachmentData()) {
-            attachmentsJson.push_back(attachment.toJson());
-        }
-        root[JSON_AVATAR_ATTACHMENTS] = attachmentsJson;
-    }
-
     _avatarEntitiesLock.withReadLock([&] {
         if (!_avatarEntityData.empty()) {
             QJsonArray avatarEntityJson;
+            int entityCount = 0;
             for (auto entityID : _avatarEntityData.keys()) {
                 QVariantMap entityData;
-                entityData.insert("id", entityID);
+                QUuid newId = _avatarEntityForRecording.size() == _avatarEntityData.size() ? _avatarEntityForRecording.values()[entityCount++] : entityID;
-                entityData.insert("properties", _avatarEntityData.value(entityID));
+                entityData.insert("id", newId);                
+                entityData.insert("properties", _avatarEntityData.value(entityID).toBase64());
                 avatarEntityJson.push_back(QVariant(entityData).toJsonObject());
             }
             root[JSON_AVATAR_ENTITIES] = avatarEntityJson;
@@ -2504,12 +2507,17 @@ void AvatarData::fromJson(const QJsonObject& json, bool useFrameSkeleton) {
         setAttachmentData(attachments);
     }
 
-    // if (json.contains(JSON_AVATAR_ENTITIES) && json[JSON_AVATAR_ENTITIES].isArray()) {
+    if (json.contains(JSON_AVATAR_ENTITIES) && json[JSON_AVATAR_ENTITIES].isArray()) {
-    //     QJsonArray attachmentsJson = json[JSON_AVATAR_ATTACHMENTS].toArray();
+        QJsonArray attachmentsJson = json[JSON_AVATAR_ENTITIES].toArray();
-    //     for (auto attachmentJson : attachmentsJson) {
+        for (auto attachmentJson : attachmentsJson) {
-    //         // TODO -- something
+            if (attachmentJson.isObject()) {
-    //     }
+                QVariantMap entityData = attachmentJson.toObject().toVariantMap();
-    // }
+                QUuid entityID = entityData.value("id").toUuid();
+                QByteArray properties = QByteArray::fromBase64(entityData.value("properties").toByteArray());
+                updateAvatarEntity(entityID, properties);
+            }
+        }
+    }
 
     if (json.contains(JSON_AVATAR_JOINT_ARRAY)) {
         if (version == (int)JsonAvatarFrameVersion::JointRotationsInRelativeFrame) {

libraries/avatars/src/AvatarData.h

@@ -1089,6 +1089,7 @@ public:
     void clearRecordingBasis();
     TransformPointer getRecordingBasis() const;
     void setRecordingBasis(TransformPointer recordingBasis = TransformPointer());
+    void createRecordingIDs();
     QJsonObject toJson() const;
     void fromJson(const QJsonObject& json, bool useFrameSkeleton = true);
 
@@ -1421,6 +1422,7 @@ protected:
 
     mutable ReadWriteLockable _avatarEntitiesLock;
     AvatarEntityIDs _avatarEntityDetached; // recently detached from this avatar
+    AvatarEntityIDs _avatarEntityForRecording; // create new entities id for avatar recording
     AvatarEntityMap _avatarEntityData;
     bool _avatarEntityDataChanged { false };
 

libraries/networking/src/udt/PacketHeaders.cpp

@@ -94,6 +94,8 @@ PacketVersion versionForPacketType(PacketType packetType) {
             return static_cast<PacketVersion>(AvatarQueryVersion::ConicalFrustums);
         case PacketType::AvatarIdentityRequest:
             return 22;
+        case PacketType::EntityQueryInitialResultsComplete:
+            return static_cast<PacketVersion>(EntityVersion::ParticleSpin);
         default:
             return 22;
     }

libraries/script-engine/src/ScriptEngine.cpp

@@ -176,9 +176,7 @@ ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const
     _timerFunctionMap(),
     _fileNameString(fileNameString),
     _arrayBufferClass(new ArrayBufferClass(this)),
-    _assetScriptingInterface(new AssetScriptingInterface(this)),
+    _assetScriptingInterface(new AssetScriptingInterface(this))
-    // don't delete `ScriptEngines` until all `ScriptEngine`s are gone
-    _scriptEngines(DependencyManager::get<ScriptEngines>())
 {
     switch (_context) {
         case Context::CLIENT_SCRIPT:

libraries/script-engine/src/ScriptEngine.h

@@ -806,8 +806,6 @@ protected:
     static const QString _SETTINGS_ENABLE_EXTENDED_EXCEPTIONS;
 
     Setting::Handle<bool> _enableExtendedJSExceptions { _SETTINGS_ENABLE_EXTENDED_EXCEPTIONS, true };
-
-    QSharedPointer<ScriptEngines> _scriptEngines;
 };
 
 ScriptEnginePointer scriptEngineFactory(ScriptEngine::Context context,

scripts/system/commerce/wallet.js

@@ -406,6 +406,11 @@
         sendMoneyRecipient = null;
     }
 
+    function onUsernameChanged() {
+        Settings.setValue("wallet/autoLogout", false);
+        Settings.setValue("wallet/savedUsername", "");
+    }
+
     // Function Name: fromQml()
     //
     // Description:
@@ -581,6 +586,7 @@
     var tablet = null;
     var walletEnabled = Settings.getValue("commerce", true);
     function startup() {
+        GlobalServices.myUsernameChanged.connect(onUsernameChanged);
         if (walletEnabled) {
             tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
             button = tablet.addButton({
@@ -612,6 +618,7 @@
         removeOverlays();
     }
     function shutdown() {
+        GlobalServices.myUsernameChanged.disconnect(onUsernameChanged);
         button.clicked.disconnect(onButtonClicked);
         tablet.removeButton(button);
         deleteSendMoneyParticleEffect();

scripts/system/snapshot.js

@@ -352,7 +352,7 @@ function fillImageDataFromPrevious() {
         containsGif: previousAnimatedSnapPath !== "",
         processingGif: false,
         shouldUpload: false,
-        canBlast: location.domainID === Settings.getValue("previousSnapshotDomainID"),
+        canBlast: snapshotDomainID === Settings.getValue("previousSnapshotDomainID"),
         isLoggedIn: isLoggedIn
     };
     imageData = [];
@@ -427,7 +427,7 @@ function snapshotUploaded(isError, reply) {
     }
     isUploadingPrintableStill = false;
 }
-var href, domainID;
+var href, snapshotDomainID;
 function takeSnapshot() {
     tablet.emitScriptEvent(JSON.stringify({
         type: "snapshot",
@@ -452,8 +452,8 @@ function takeSnapshot() {
     // Even the domainID could change (e.g., if the user falls into a teleporter while recording).
     href = location.href;
     Settings.setValue("previousSnapshotHref", href);
-    domainID = location.domainID;
+    snapshotDomainID = location.domainID;
-    Settings.setValue("previousSnapshotDomainID", domainID);
+    Settings.setValue("previousSnapshotDomainID", snapshotDomainID);
 
     maybeDeleteSnapshotStories();
 
@@ -551,7 +551,7 @@ function stillSnapshotTaken(pathStillSnapshot, notify) {
 
     HMD.openTablet();
 
-    isDomainOpen(domainID, function (canShare) {
+    isDomainOpen(snapshotDomainID, function (canShare) {
         snapshotOptions = {
             containsGif: false,
             processingGif: false,
@@ -594,7 +594,7 @@ function processingGifStarted(pathStillSnapshot) {
 
     HMD.openTablet();
     
-    isDomainOpen(domainID, function (canShare) {
+    isDomainOpen(snapshotDomainID, function (canShare) {
         snapshotOptions = {
             containsGif: true,
             processingGif: true,
@@ -622,7 +622,7 @@ function processingGifCompleted(pathAnimatedSnapshot) {
 
     Settings.setValue("previousAnimatedSnapPath", pathAnimatedSnapshot);
 
-    isDomainOpen(domainID, function (canShare) {
+    isDomainOpen(snapshotDomainID, function (canShare) {
         snapshotOptions = {
             containsGif: true,
             processingGif: false,