Merge conflicts

assignment-client/src/octree/OctreeSendThread.cpp

@@ -82,8 +82,12 @@ bool OctreeSendThread::process() {
         if (auto node = _node.lock()) {
             OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(node->getLinkedData());
 
-            // Sometimes the node data has not yet been linked, in which case we can't really do anything
+            // If we don't have the OctreeQueryNode at all
-            if (nodeData && !nodeData->isShuttingDown()) {
+            // or it's uninitialized because we haven't received a query yet from the client
+            // or we don't know where we should send packets for this node
+            // or we're shutting down
+            // then we can't send an entity data packet
+            if (nodeData && nodeData->hasReceivedFirstQuery() && node->getActiveSocket() && !nodeData->isShuttingDown()) {
                 bool viewFrustumChanged = nodeData->updateCurrentViewFrustum();
                 packetDistributor(node, nodeData, viewFrustumChanged);
             }

interface/resources/qml/AddressBarDialog.qml

@@ -1,532 +0,0 @@
-//
-//  AddressBarDialog.qml
-//
-//  Created by Austin Davis on 2015/04/14
-//  Copyright 2015 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-import Hifi 1.0
-import QtQuick 2.4
-import "controls"
-import "styles"
-import "windows"
-import "hifi"
-import "hifi/toolbars"
-import "styles-uit" as HifiStyles
-import "controls-uit" as HifiControls
-
-Window {
-    id: root
-    HifiConstants { id: hifi }
-    HifiStyles.HifiConstants { id: hifiStyleConstants }
-
-    objectName: "AddressBarDialog"
-    title: "Go To:"
-
-    shown: false
-    destroyOnHidden: false
-    resizable: false
-    pinnable: false;
-
-    width: addressBarDialog.implicitWidth
-    height: addressBarDialog.implicitHeight
-    property int gap: 14
-
-    onShownChanged: {
-        addressBarDialog.keyboardEnabled = HMD.active;
-        addressBarDialog.observeShownChanged(shown);
-    }
-    Component.onCompleted: {
-        root.parentChanged.connect(center);
-        center();
-    }
-    Component.onDestruction: {
-        root.parentChanged.disconnect(center);
-    }
-
-    function center() {
-        // Explicitly center in order to avoid warnings at shutdown
-        anchors.centerIn = parent;
-    }
-
-    function resetAfterTeleport() {
-        storyCardFrame.shown = root.shown = false;
-    }
-    function goCard(targetString) {
-        if (0 !== targetString.indexOf('hifi://')) {
-            storyCardHTML.url = addressBarDialog.metaverseServerUrl + targetString;
-            storyCardFrame.shown = true;
-            return;
-        }
-        addressLine.text = targetString;
-        toggleOrGo(true);
-        clearAddressLineTimer.start();
-    }
-    property var allStories: [];
-    property int cardWidth: 212;
-    property int cardHeight: 152;
-    property string metaverseBase: addressBarDialog.metaverseServerUrl + "/api/v1/";
-    property bool isCursorVisible: false  // Override default cursor visibility.
-
-    AddressBarDialog {
-        id: addressBarDialog
-
-        property bool keyboardEnabled: false
-        property bool keyboardRaised: false
-        property bool punctuationMode: false
-
-        implicitWidth: backgroundImage.width
-        implicitHeight: scroll.height + gap + backgroundImage.height + (keyboardEnabled ? keyboard.height : 0);
-
-        // The buttons have their button state changed on hover, so we have to manually fix them up here
-        onBackEnabledChanged: backArrow.buttonState = addressBarDialog.backEnabled ? 1 : 0;
-        onForwardEnabledChanged: forwardArrow.buttonState = addressBarDialog.forwardEnabled ? 1 : 0;
-        onReceivedHifiSchemeURL: resetAfterTeleport();
-
-        // Update location after using back and forward buttons.
-        onHostChanged: updateLocationTextTimer.start();
-
-        ListModel { id: suggestions }
-
-        ListView {
-            id: scroll
-            height: cardHeight + scroll.stackedCardShadowHeight
-            property int stackedCardShadowHeight: 10;
-            spacing: gap;
-            clip: true;
-            anchors {
-                left: backgroundImage.left
-                right: swipe.left
-                bottom: backgroundImage.top
-            }
-            model: suggestions;
-            orientation: ListView.Horizontal;
-            delegate: Card {
-                width: cardWidth;
-                height: cardHeight;
-                goFunction: goCard;
-                userName: model.username;
-                placeName: model.place_name;
-                hifiUrl: model.place_name + model.path;
-                thumbnail: model.thumbnail_url;
-                imageUrl: model.image_url;
-                action: model.action;
-                timestamp: model.created_at;
-                onlineUsers: model.online_users;
-                storyId: model.metaverseId;
-                drillDownToPlace: model.drillDownToPlace;
-                shadowHeight: scroll.stackedCardShadowHeight;
-                hoverThunk: function () { ListView.view.currentIndex = index; }
-                unhoverThunk: function () { ListView.view.currentIndex = -1; }
-            }
-            highlightMoveDuration: -1;
-            highlightMoveVelocity: -1;
-            highlight: Rectangle { color: "transparent"; border.width: 4; border.color: hifiStyleConstants.colors.blueHighlight; z: 1; }
-        }
-        Image { // Just a visual indicator that the user can swipe the cards over to see more.
-            id: swipe;
-            source: "../images/swipe-chevron.svg";
-            width: 72;
-            visible: suggestions.count > 3;
-            anchors {
-                right: backgroundImage.right;
-                top: scroll.top;
-            }
-            MouseArea {
-                anchors.fill: parent
-                onClicked: scroll.currentIndex = (scroll.currentIndex < 0) ? 3 : (scroll.currentIndex + 3)
-            }
-        }
-
-        Row {
-            spacing: 2 * hifi.layout.spacing;
-            anchors {
-                top: parent.top;
-                left: parent.left;
-                leftMargin: 150;
-                topMargin: -30;
-            }
-            property var selected: allTab;
-            TextButton {
-                id: allTab;
-                text: "ALL";
-                property string includeActions: 'snapshot,concurrency';
-                selected: allTab === selectedTab;
-                action: tabSelect;
-            }
-            TextButton {
-                id: placeTab;
-                text: "PLACES";
-                property string includeActions: 'concurrency';
-                selected: placeTab === selectedTab;
-                action: tabSelect;
-            }
-            TextButton {
-                id: snapsTab;
-                text: "SNAPS";
-                property string includeActions: 'snapshot';
-                selected: snapsTab === selectedTab;
-                action: tabSelect;
-            }
-        }
-
-        Image {
-            id: backgroundImage
-            source: "../images/address-bar-856.svg"
-            width: 856
-            height: 100
-            anchors {
-                bottom: parent.keyboardEnabled ? keyboard.top : parent.bottom;
-            }
-            property int inputAreaHeight: 70
-            property int inputAreaStep: (height - inputAreaHeight) / 2
-
-            ToolbarButton {
-                id: homeButton
-                imageURL: "../images/home.svg"
-                onClicked: {
-                    addressBarDialog.loadHome();
-                    root.shown = false;
-                }
-                anchors {
-                    left: parent.left
-                    leftMargin: homeButton.width / 2
-                    verticalCenter: parent.verticalCenter
-                }
-            }
-
-            ToolbarButton {
-                id: backArrow;
-                imageURL: "../images/backward.svg";
-                onClicked: addressBarDialog.loadBack();
-                anchors {
-                    left: homeButton.right
-                    verticalCenter: parent.verticalCenter
-                }
-            }
-            ToolbarButton {
-                id: forwardArrow;
-                imageURL: "../images/forward.svg";
-                onClicked: addressBarDialog.loadForward();
-                anchors {
-                    left: backArrow.right
-                    verticalCenter: parent.verticalCenter
-                }
-            }
-
-            HifiStyles.RalewayLight {
-                id: notice;
-                font.pixelSize: hifi.fonts.pixelSize * 0.50;
-                anchors {
-                    top: parent.top
-                    topMargin: parent.inputAreaStep + 12
-                    left: addressLine.left
-                    right: addressLine.right
-                }
-            }
-            HifiStyles.FiraSansRegular {
-                id: location;
-                font.pixelSize: addressLine.font.pixelSize;
-                color: "gray";
-                clip: true;
-                anchors.fill: addressLine;
-                visible: addressLine.text.length === 0
-            }
-            TextInput {
-                id: addressLine
-                focus: true
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                    left: forwardArrow.right
-                    right: parent.right
-                    leftMargin: forwardArrow.width
-                    rightMargin: forwardArrow.width / 2
-                    topMargin: parent.inputAreaStep + (2 * hifi.layout.spacing)
-                    bottomMargin: parent.inputAreaStep
-                }
-                font.pixelSize: hifi.fonts.pixelSize * 0.75
-                cursorVisible: false
-                onTextChanged: {
-                    filterChoicesByText();
-                    updateLocationText(text.length > 0);
-                    if (!isCursorVisible && text.length > 0) {
-                        isCursorVisible = true;
-                        cursorVisible = true;
-                    }
-                }
-                onActiveFocusChanged: {
-                    cursorVisible = isCursorVisible && focus;
-                }
-                MouseArea {
-                    // If user clicks in address bar show cursor to indicate ability to enter address.
-                    anchors.fill: parent
-                    onClicked: {
-                        isCursorVisible = true;
-                        parent.cursorVisible = true;
-                        parent.forceActiveFocus();
-                    }
-                }
-            }
-        }
-
-        Timer {
-            // Delay updating location text a bit to avoid flicker of content and so that connection status is valid.
-            id: updateLocationTextTimer
-            running: false
-            interval: 500  // ms
-            repeat: false
-            onTriggered: updateLocationText(false);
-        }
-
-        Timer {
-            // Delay clearing address line so as to avoid flicker of "not connected" being displayed after entering an address.
-            id: clearAddressLineTimer
-            running: false
-            interval: 100  // ms
-            repeat: false
-            onTriggered: {
-                addressLine.text = "";
-                isCursorVisible = false;
-            }
-        }
-
-        Window {
-            width: 938
-            height: 625
-            HifiControls.WebView {
-                anchors.fill: parent;
-                id: storyCardHTML;
-            }
-            id: storyCardFrame;
-
-            shown: false;
-            destroyOnCloseButton: false;
-            pinnable: false;
-
-            anchors {
-                verticalCenter: backgroundImage.verticalCenter;
-                horizontalCenter: scroll.horizontalCenter;
-            }
-            z: 100
-        }
-
-        HifiControls.Keyboard {
-            id: keyboard
-            raised: parent.keyboardEnabled  // Ignore keyboardRaised; keep keyboard raised if enabled (i.e., in HMD).
-            numeric: parent.punctuationMode
-            anchors {
-                bottom: parent.bottom
-                left: parent.left
-                right: parent.right
-            }
-        }
-    }
-
-    function getRequest(url, cb) { // cb(error, responseOfCorrectContentType) of url. General for 'get' text/html/json, but without redirects.
-        // TODO: make available to other .qml.
-        var request = new XMLHttpRequest();
-        // QT bug: apparently doesn't handle onload. Workaround using readyState.
-        request.onreadystatechange = function () {
-            var READY_STATE_DONE = 4;
-            var HTTP_OK = 200;
-            if (request.readyState >= READY_STATE_DONE) {
-                var error = (request.status !== HTTP_OK) && request.status.toString() + ':' + request.statusText,
-                    response = !error && request.responseText,
-                    contentType = !error && request.getResponseHeader('content-type');
-                if (!error && contentType.indexOf('application/json') === 0) {
-                    try {
-                        response = JSON.parse(response);
-                    } catch (e) {
-                        error = e;
-                    }
-                }
-                cb(error, response);
-            }
-        };
-        request.open("GET", url, true);
-        request.send();
-    }
-
-    function identity(x) {
-        return x;
-    }
-
-    function handleError(url, error, data, cb) { // cb(error) and answer truthy if needed, else falsey
-        if (!error && (data.status === 'success')) {
-            return;
-        }
-        if (!error) { // Create a message from the data
-            error = data.status + ': ' + data.error;
-        }
-        if (typeof(error) === 'string') { // Make a proper Error object
-            error = new Error(error);
-        }
-        error.message += ' in ' + url; // Include the url.
-        cb(error);
-        return true;
-    }
-    function resolveUrl(url) {
-        return (url.indexOf('/') === 0) ? (addressBarDialog.metaverseServerUrl + url) : url;
-    }
-
-    function makeModelData(data) { // create a new obj from data
-        // ListModel elements will only ever have those properties that are defined by the first obj that is added.
-        // So here we make sure that we have all the properties we need, regardless of whether it is a place data or user story.
-        var name = data.place_name,
-            tags = data.tags || [data.action, data.username],
-            description = data.description || "",
-            thumbnail_url = data.thumbnail_url || "";
-        return {
-            place_name: name,
-            username: data.username || "",
-            path: data.path || "",
-            created_at: data.created_at || "",
-            action: data.action || "",
-            thumbnail_url: resolveUrl(thumbnail_url),
-            image_url: resolveUrl(data.details.image_url),
-
-            metaverseId: (data.id || "").toString(), // Some are strings from server while others are numbers. Model objects require uniformity.
-
-            tags: tags,
-            description: description,
-            online_users: data.details.concurrency || 0,
-            drillDownToPlace: false,
-
-            searchText: [name].concat(tags, description || []).join(' ').toUpperCase()
-        }
-    }
-    function suggestable(place) {
-        if (place.action === 'snapshot') {
-            return true;
-        }
-        return (place.place_name !== AddressManager.placename); // Not our entry, but do show other entry points to current domain.
-    }
-    property var selectedTab: allTab;
-    function tabSelect(textButton) {
-        selectedTab = textButton;
-        fillDestinations();
-    }
-    property var placeMap: ({});
-    function addToSuggestions(place) {
-        var collapse = allTab.selected && (place.action !== 'concurrency');
-        if (collapse) {
-            var existing = placeMap[place.place_name];
-            if (existing) {
-                existing.drillDownToPlace = true;
-                return;
-            }
-        }
-        suggestions.append(place);
-        if (collapse) {
-            placeMap[place.place_name] = suggestions.get(suggestions.count - 1);
-        } else if (place.action === 'concurrency') {
-            suggestions.get(suggestions.count - 1).drillDownToPlace = true; // Don't change raw place object (in allStories).
-        }
-    }
-    property int requestId: 0;
-    function getUserStoryPage(pageNumber, cb) { // cb(error) after all pages of domain data have been added to model
-        var options = [
-            'now=' + new Date().toISOString(),
-            'include_actions=' + selectedTab.includeActions,
-            'restriction=' + (Account.isLoggedIn() ? 'open,hifi' : 'open'),
-            'require_online=true',
-            'protocol=' + encodeURIComponent(AddressManager.protocolVersion()),
-            'page=' + pageNumber
-        ];
-        var url = metaverseBase + 'user_stories?' + options.join('&');
-        var thisRequestId = ++requestId;
-        getRequest(url, function (error, data) {
-            if ((thisRequestId !== requestId) || handleError(url, error, data, cb)) {
-                return;
-            }
-            var stories = data.user_stories.map(function (story) { // explicit single-argument function
-                return makeModelData(story, url);
-            });
-            allStories = allStories.concat(stories);
-            stories.forEach(makeFilteredPlaceProcessor());
-            if ((data.current_page < data.total_pages) && (data.current_page <=  10)) { // just 10 pages = 100 stories for now
-                return getUserStoryPage(pageNumber + 1, cb);
-            }
-            cb();
-        });
-    }
-    function makeFilteredPlaceProcessor() { // answer a function(placeData) that adds it to suggestions if it matches
-        var words = addressLine.text.toUpperCase().split(/\s+/).filter(identity),
-            data = allStories;
-        function matches(place) {
-            if (!words.length) {
-                return suggestable(place);
-            }
-            return words.every(function (word) {
-                return place.searchText.indexOf(word) >= 0;
-            });
-        }
-        return function (place) {
-            if (matches(place)) {
-                addToSuggestions(place);
-            }
-        };
-    }
-    function filterChoicesByText() {
-        suggestions.clear();
-        placeMap = {};
-        allStories.forEach(makeFilteredPlaceProcessor());
-    }
-
-    function fillDestinations() {
-        allStories = [];
-        suggestions.clear();
-        placeMap = {};
-        getUserStoryPage(1, function (error) {
-            console.log('user stories query', error || 'ok', allStories.length);
-        });
-    }
-
-    function updateLocationText(enteringAddress) {
-        if (enteringAddress) {
-            notice.text = "Go to a place, @user, path or network address";
-            notice.color = hifiStyleConstants.colors.baseGrayHighlight;
-        } else {
-            notice.text = AddressManager.isConnected ? "Your location:" : "Not Connected";
-            notice.color = AddressManager.isConnected ? hifiStyleConstants.colors.baseGrayHighlight : hifiStyleConstants.colors.redHighlight;
-            // Display hostname, which includes ip address, localhost, and other non-placenames.
-            location.text = (AddressManager.placename || AddressManager.hostname || '') + (AddressManager.pathname ? AddressManager.pathname.match(/\/[^\/]+/)[0] : '');
-        }
-    }
-
-    onVisibleChanged: {
-        updateLocationText(false);
-        if (visible) {
-            addressLine.forceActiveFocus();
-            fillDestinations();
-        }
-    }
-
-    function toggleOrGo(fromSuggestions) {
-        if (addressLine.text !== "") {
-            addressBarDialog.loadAddress(addressLine.text, fromSuggestions)
-        }
-        root.shown = false;
-    }
-
-    Keys.onPressed: {
-        switch (event.key) {
-            case Qt.Key_Escape:
-            case Qt.Key_Back:
-                root.shown = false
-                clearAddressLineTimer.start();
-                event.accepted = true
-                break
-            case Qt.Key_Enter:
-            case Qt.Key_Return:
-                toggleOrGo()
-                clearAddressLineTimer.start();
-                event.accepted = true
-                break
-        }
-    }
-}

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

@@ -52,8 +52,6 @@ Item {
         onWalletAuthenticatedStatusResult: {
             if (isAuthenticated) {
                 root.activeView = "step_4";
-            } else {
-                root.activeView = "step_3";
             }
         }
 

interface/resources/qml/hifi/tablet/TabletAddressDialog.qml

@@ -11,6 +11,7 @@
 import Hifi 1.0
 import QtQuick 2.7
 import QtQuick.Controls 2.2
+import QtQuick.Controls.Styles 1.4
 import QtGraphicalEffects 1.0
 import "../../controls"
 import "../../styles"
@@ -83,7 +84,6 @@ StackView {
         anchors.centerIn = parent;
     }
 
-
     function resetAfterTeleport() {
         //storyCardFrame.shown = root.shown = false;
     }
@@ -134,7 +134,8 @@ StackView {
             bottom: parent.bottom
         }
 
-        onHostChanged: updateLocationTextTimer.start();
+        onHostChanged: updateLocationTextTimer.restart();
+
         Rectangle {
             id: navBar
             width: parent.width
@@ -205,16 +206,16 @@ StackView {
                 anchors {
                     top: parent.top;
                     left: addressLineContainer.left;
-                    right: addressLineContainer.right;
                 }
             }
 
             HifiStyles.FiraSansRegular {
                 id: location;
                 anchors {
-                    left: addressLineContainer.left;
+                    left: notice.right
-                    leftMargin: 8;
+                    leftMargin: 8
-                    verticalCenter: addressLineContainer.verticalCenter;
+                    right: addressLineContainer.right
+                    verticalCenter: notice.verticalCenter
                 }
                 font.pixelSize: addressLine.font.pixelSize;
                 color: "gray";
@@ -222,7 +223,7 @@ StackView {
                 visible: addressLine.text.length === 0
             }
 
-            TextInput {
+            TextField {
                 id: addressLine
                 width: addressLineContainer.width - addressLineContainer.anchors.leftMargin - addressLineContainer.anchors.rightMargin;
                 anchors {
@@ -230,7 +231,6 @@ StackView {
                     leftMargin: 8;
                     verticalCenter: addressLineContainer.verticalCenter;
                 }
-                font.pixelSize: hifi.fonts.pixelSize * 0.75
                 onTextChanged: {
                     updateLocationText(text.length > 0);
                 }
@@ -238,6 +238,17 @@ StackView {
                     addressBarDialog.keyboardEnabled = false;
                     toggleOrGo();
                 }
+                placeholderText: "Type domain address here"
+                verticalAlignment: TextInput.AlignBottom
+                style: TextFieldStyle {
+                    textColor: hifi.colors.text
+                    placeholderTextColor: "gray"
+                    font {
+                        family: hifi.fonts.fontFamily
+                        pixelSize: hifi.fonts.pixelSize * 0.75
+                    }
+                    background: Item {}
+                }
             }
 
             Rectangle {
@@ -347,7 +358,7 @@ StackView {
             // Delay updating location text a bit to avoid flicker of content and so that connection status is valid.
             id: updateLocationTextTimer
             running: false
-            interval: 500  // ms
+            interval: 1000  // ms
             repeat: false
             onTriggered: updateLocationText(false);
         }

interface/src/Application.cpp

@@ -1823,6 +1823,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // Preload Tablet sounds
     DependencyManager::get<TabletScriptingInterface>()->preloadSounds();
 
+    _pendingIdleEvent = false;
+    _pendingRenderEvent = false;
+
     qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
 }
 

interface/src/Application.h

@@ -708,7 +708,7 @@ private:
 
     friend class RenderEventHandler;
 
-    std::atomic<bool> _pendingIdleEvent { false };
+    std::atomic<bool> _pendingIdleEvent { true };
-    std::atomic<bool> _pendingRenderEvent { false };
+    std::atomic<bool> _pendingRenderEvent { true };
 };
 #endif // hifi_Application_h

interface/src/ui/AddressBarDialog.cpp

@@ -40,6 +40,10 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
     _backEnabled = !(DependencyManager::get<AddressManager>()->getBackStack().isEmpty());
     _forwardEnabled = !(DependencyManager::get<AddressManager>()->getForwardStack().isEmpty());
     connect(addressManager.data(), &AddressManager::hostChanged, this, &AddressBarDialog::hostChanged);
+    auto nodeList = DependencyManager::get<NodeList>();
+    const DomainHandler& domainHandler = nodeList->getDomainHandler();
+    connect(&domainHandler, &DomainHandler::connectedToDomain, this, &AddressBarDialog::hostChanged);
+    connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, &AddressBarDialog::hostChanged);
     connect(DependencyManager::get<DialogsManager>().data(), &DialogsManager::setUseFeed, this, &AddressBarDialog::setUseFeed);
     connect(qApp, &Application::receivedHifiSchemeURL, this, &AddressBarDialog::receivedHifiSchemeURL);
 }

libraries/entities/src/ParticleEffectEntityItem.cpp

@@ -97,7 +97,8 @@ bool operator==(const Properties& a, const Properties& b) {
         (a.maxParticles == b.maxParticles) &&
         (a.emission == b.emission) &&
         (a.polar == b.polar) &&
-        (a.azimuth == b.azimuth);
+        (a.azimuth == b.azimuth) &&
+        (a.textures == b.textures);
 }
 
 bool operator!=(const Properties& a, const Properties& b) {

libraries/octree/src/OctreeQuery.h

@@ -31,7 +31,7 @@ public:
     virtual ~OctreeQuery() {}
 
     int getBroadcastData(unsigned char* destinationBuffer);
-    int parseData(ReceivedMessage& message) override;
+    virtual int parseData(ReceivedMessage& message) override;
 
     // getters for camera details
     const glm::vec3& getCameraPosition() const { return _cameraPosition; }

libraries/octree/src/OctreeQueryNode.cpp

@@ -18,6 +18,12 @@
 #include <SharedUtil.h>
 #include <UUID.h>
 
+int OctreeQueryNode::parseData(ReceivedMessage& message) {
+    // set our flag to indicate that we've parsed for this query at least once
+    _hasReceivedFirstQuery = true;
+
+    return OctreeQuery::parseData(message);
+}
 
 void OctreeQueryNode::nodeKilled() {
     _isShuttingDown = true;

libraries/octree/src/OctreeQueryNode.h

@@ -35,6 +35,8 @@ public:
     void init(); // called after creation to set up some virtual items
     virtual PacketType getMyPacketType() const = 0;
 
+    virtual int parseData(ReceivedMessage& message) override;
+
     void resetOctreePacket();  // resets octree packet to after "V" header
 
     void writeToPacket(const unsigned char* buffer, unsigned int bytes); // writes to end of packet
@@ -106,6 +108,8 @@ public:
     bool shouldForceFullScene() const { return _shouldForceFullScene; }
     void setShouldForceFullScene(bool shouldForceFullScene) { _shouldForceFullScene = shouldForceFullScene; }
 
+    bool hasReceivedFirstQuery() const  { return _hasReceivedFirstQuery; }
+
 private:
     OctreeQueryNode(const OctreeQueryNode &);
     OctreeQueryNode& operator= (const OctreeQueryNode&);
@@ -153,6 +157,8 @@ private:
     QJsonObject _lastCheckJSONParameters;
 
     bool _shouldForceFullScene { false };
+
+    bool _hasReceivedFirstQuery { false };
 };
 
 #endif // hifi_OctreeQueryNode_h

scripts/system/edit.js

@@ -1424,24 +1424,29 @@ function deleteSelectedEntities() {
         for (var i = 0; i < newSortedSelection.length; i++) {
             var entityID = newSortedSelection[i];
             var initialProperties = SelectionManager.savedProperties[entityID];
-            var children = Entities.getChildrenIDs(entityID);
+            if (!initialProperties.locked) {
-            var childList = [];
+                var children = Entities.getChildrenIDs(entityID);
-            recursiveDelete(children, childList, deletedIDs);
+                var childList = [];
-            savedProperties.push({
+                recursiveDelete(children, childList, deletedIDs);
-                entityID: entityID,
+                savedProperties.push({
-                properties: initialProperties,
+                    entityID: entityID,
-                children: childList
+                    properties: initialProperties,
-            });
+                    children: childList
-            deletedIDs.push(entityID);
+                });
-            Entities.deleteEntity(entityID);
+                deletedIDs.push(entityID);
+                Entities.deleteEntity(entityID);
+            }
         }
-        SelectionManager.clearSelections();
-        pushCommandForSelections([], savedProperties);
 
-        entityListTool.webView.emitScriptEvent(JSON.stringify({
+        if (savedProperties.length > 0) {
-            type: "deleted",
+            SelectionManager.clearSelections();
-            ids: deletedIDs
+            pushCommandForSelections([], savedProperties);
-        }));
+
+            entityListTool.webView.emitScriptEvent(JSON.stringify({
+                type: "deleted",
+                ids: deletedIDs
+            }));
+        }
     }
 }
 

scripts/system/libraries/WebTablet.js

@@ -155,8 +155,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
         localRotation: { x: 0, y: 1, z: 0, w: 0 },
         dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor },
         solid: true,
-        outerRadius: 25 * tabletScaleFactor,
+        innerRadius: 0.9,
-        innerRadius: 20 * tabletScaleFactor,
         ignoreIntersection: true,
         alpha: 1.0,
         color: { red: 255, green: 255, blue: 255 },

scripts/system/libraries/utils.js

@@ -409,15 +409,16 @@ resizeTablet = function (width, newParentJointIndex, sensorToWorldScaleOverride)
 
     // update homeButton
     var HOME_BUTTON_Y_OFFSET = ((tabletHeight / 2) - (tabletHeight / 20)) * sensorScaleOffsetOverride;
+    var homeButtonDim = 4 * tabletScaleFactor;
     Overlays.editOverlay(HMD.homeButtonID, {
         localPosition: {x: -0.001, y: -HOME_BUTTON_Y_OFFSET, z: 0.0},
-        dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor}
+        dimensions: { x: homeButtonDim, y: homeButtonDim, z: homeButtonDim}
     });
 
+    // Circle3D overlays render at 1.5x their proper dimensions
+    var highlightDim = homeButtonDim / 3.0;
     Overlays.editOverlay(HMD.homeButtonHighlightID, {
         localPosition: { x: 0, y: -HOME_BUTTON_Y_OFFSET + 0.003, z: -0.0158 },
-        dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor },
+        dimensions: { x: highlightDim, y: highlightDim, z: highlightDim }
-        outerRadius: 25 * tabletScaleFactor,
-        innerRadius: 20 * tabletScaleFactor
     });
 };

scripts/system/particle_explorer/hifi-entity-ui.js

@@ -482,14 +482,23 @@ HifiEntityUI.prototype = {
         textureImage.className = "texture-image no-texture";
         var image = document.createElement("img");
         var imageLoad = _.debounce(function (url) {
-            if (url.length > 0) {
+            if (url.slice(0, 5).toLowerCase() === "atp:/") {
+                image.src = "";
+                image.style.display = "none";
+                textureImage.classList.remove("with-texture");
                 textureImage.classList.remove("no-texture");
+                textureImage.classList.add("no-preview");
+            } else if (url.length > 0) {
+                textureImage.classList.remove("no-texture");
+                textureImage.classList.remove("no-preview");
                 textureImage.classList.add("with-texture");
                 image.src = url;
                 image.style.display = "block";
             } else {
                 image.src = "";
                 image.style.display = "none";
+                textureImage.classList.remove("with-texture");
+                textureImage.classList.remove("no-preview");
                 textureImage.classList.add("no-texture");
             }
             self.webBridgeSync(group.id, url);