merge master into home content branch

README.md

@@ -8,14 +8,14 @@ like to get paid for your work, make sure you report the bug via a job on
 [Worklist.net](https://worklist.net).
 
 We're hiring! We're looking for skilled developers; 
-send your resume to hiring@highfidelity.io
+send your resume to hiring@highfidelity.com
 
 ##### Chat with us
 Come chat with us in [our Gitter](http://gitter.im/highfidelity/hifi) if you have any questions or just want to say hi!
 
 Documentation
 =========
-Documentation is available at [docs.highfidelity.io](http://docs.highfidelity.io), if something is missing, please suggest it via a new job on Worklist (add to the hifi-docs project).
+Documentation is available at [docs.highfidelity.com](http://docs.highfidelity.com), if something is missing, please suggest it via a new job on Worklist (add to the hifi-docs project).
 
 Build Instructions 
 =========

assignment-client/src/Agent.cpp

@@ -222,7 +222,6 @@ void Agent::executeScript() {
     scriptedAvatar->setForceFaceTrackerConnected(true);
 
     // call model URL setters with empty URLs so our avatar, if user, will have the default models
-    scriptedAvatar->setFaceModelURL(QUrl());
     scriptedAvatar->setSkeletonModelURL(QUrl());
 
     // give this AvatarData object to the script engine

assignment-client/src/assets/AssetServer.cpp

@@ -12,19 +12,21 @@
 
 #include "AssetServer.h"
 
-#include <QCoreApplication>
-#include <QCryptographicHash>
-#include <QDateTime>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QString>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QString>
+
+#include <ServerPathUtils.h>
 
 #include "NetworkLogging.h"
 #include "NodeType.h"
 #include "SendAssetTask.h"
 #include "UploadAssetTask.h"
-#include <ServerPathUtils.h>
 
 const QString ASSET_SERVER_LOGGING_TARGET_NAME = "asset-server";
 
@@ -42,6 +44,7 @@ AssetServer::AssetServer(ReceivedMessage& message) :
     packetReceiver.registerListener(PacketType::AssetGet, this, "handleAssetGet");
     packetReceiver.registerListener(PacketType::AssetGetInfo, this, "handleAssetGetInfo");
     packetReceiver.registerListener(PacketType::AssetUpload, this, "handleAssetUpload");
+    packetReceiver.registerListener(PacketType::AssetMappingOperation, this, "handleAssetMappingOperation");
 }
 
 void AssetServer::run() {
@@ -56,6 +59,8 @@ void AssetServer::run() {
     ThreadedAssignment::commonInit(ASSET_SERVER_LOGGING_TARGET_NAME, NodeType::AssetServer);
 }
 
+static const QString ASSET_FILES_SUBDIR = "files";
+
 void AssetServer::completeSetup() {
     auto nodeList = DependencyManager::get<NodeList>();
 
@@ -72,6 +77,18 @@ void AssetServer::completeSetup() {
 
     auto assetServerObject = settingsObject[ASSET_SERVER_SETTINGS_KEY].toObject();
 
+    static const QString MAX_BANDWIDTH_OPTION = "max_bandwidth";
+    auto maxBandwidthValue = assetServerObject[MAX_BANDWIDTH_OPTION];
+    auto maxBandwidthFloat = maxBandwidthValue.toDouble(-1);
+
+    if (maxBandwidthFloat > 0.0) {
+        const int BYTES_PER_MEGABITS = (1024 * 1024) / 8;
+        int maxBandwidth = maxBandwidthFloat * BYTES_PER_MEGABITS;
+        nodeList->setConnectionMaxBandwidth(maxBandwidth);
+        qInfo() << "Set maximum bandwith per connection to" << maxBandwidthFloat << "Mb/s."
+                    " (" << maxBandwidth << "bytes/sec)";
+    }
+
     // get the path to the asset folder from the domain server settings
     static const QString ASSETS_PATH_OPTION = "assets_path";
     auto assetsJSONValue = assetServerObject[ASSETS_PATH_OPTION];
@@ -96,85 +113,208 @@ void AssetServer::completeSetup() {
 
     qDebug() << "Creating resources directory";
     _resourcesDirectory.mkpath(".");
+    _filesDirectory = _resourcesDirectory;
 
-    bool noExistingAssets = !_resourcesDirectory.exists() || _resourcesDirectory.entryList(QDir::Files).size() == 0;
-
-    if (noExistingAssets) {
-        qDebug() << "Asset resources directory empty, searching for existing asset resources to migrate";
-        QString oldDataDirectory = QCoreApplication::applicationDirPath();
-
-        const QString OLD_RESOURCES_PATH = "assets";
-
-        auto oldResourcesDirectory = QDir(oldDataDirectory).filePath("resources/" + OLD_RESOURCES_PATH);
-
-
-        if (QDir(oldResourcesDirectory).exists()) {
-            qDebug() << "Existing assets found in " << oldResourcesDirectory << ", copying to " << _resourcesDirectory;
-
-
-            QDir resourcesParentDirectory = _resourcesDirectory.filePath("..");
-            if (!resourcesParentDirectory.exists()) {
-                qDebug() << "Creating data directory " << resourcesParentDirectory.absolutePath();
-                resourcesParentDirectory.mkpath(".");
-            }
-
-            auto files = QDir(oldResourcesDirectory).entryList(QDir::Files);
-
-            for (auto& file : files) {
-                auto from = oldResourcesDirectory + QDir::separator() + file;
-                auto to = _resourcesDirectory.absoluteFilePath(file);
-                qDebug() << "\tCopying from " << from << " to " << to;
-                QFile::copy(from, to);
-            }
-
-        }
+    if (!_resourcesDirectory.mkpath(ASSET_FILES_SUBDIR) || !_filesDirectory.cd(ASSET_FILES_SUBDIR)) {
+        qCritical() << "Unable to create file directory for asset-server files. Stopping assignment.";
+        setFinished(true);
+        return;
     }
-    qDebug() << "Serving files from: " << _resourcesDirectory.path();
 
-    // Scan for new files
-    qDebug() << "Looking for new files in asset directory";
-    auto files = _resourcesDirectory.entryInfoList(QDir::Files);
-    QRegExp filenameRegex { "^[a-f0-9]{" + QString::number(SHA256_HASH_HEX_LENGTH) + "}(\\..+)?$" };
-    for (const auto& fileInfo : files) {
-        auto filename = fileInfo.fileName();
-        if (!filenameRegex.exactMatch(filename)) {
-            qDebug() << "Found file: " << filename;
-            if (!fileInfo.isReadable()) {
-                qDebug() << "\tCan't open file for reading: " << filename;
-                continue;
-            }
+    // load whatever mappings we currently have from the local file
+    loadMappingsFromFile();
 
-            // Read file
-            QFile file { fileInfo.absoluteFilePath() };
-            file.open(QFile::ReadOnly);
-            QByteArray data = file.readAll();
+    qInfo() << "Serving files from: " << _filesDirectory.path();
 
-            auto hash = hashData(data);
-            auto hexHash = hash.toHex();
+    // Check the asset directory to output some information about what we have
+    auto files = _filesDirectory.entryList(QDir::Files);
 
-            qDebug() << "\tMoving " << filename << " to " << hexHash;
-            
-            file.rename(_resourcesDirectory.absoluteFilePath(hexHash) + "." + fileInfo.suffix());
-        }
-    }
+    QRegExp hashFileRegex { ASSET_HASH_REGEX_STRING };
+    auto hashedFiles = files.filter(hashFileRegex);
+
+    qInfo() << "There are" << hashedFiles.size() << "asset files in the asset directory.";
+
+    performMappingMigration();
 
     nodeList->addNodeTypeToInterestSet(NodeType::Agent);
 }
 
+void AssetServer::performMappingMigration() {
+    QRegExp hashFileRegex { "^[a-f0-9]{" + QString::number(SHA256_HASH_HEX_LENGTH) + "}(\\.[\\w]+)+$" };
+
+    auto files = _resourcesDirectory.entryInfoList(QDir::Files);
+
+    for (const auto& fileInfo : files) {
+        if (hashFileRegex.exactMatch(fileInfo.fileName())) {
+            // we have a pre-mapping file that we should migrate to the new mapping system
+            qDebug() << "Migrating pre-mapping file" << fileInfo.fileName();
+
+            // rename the file to the same name with no extension
+            QFile oldFile { fileInfo.absoluteFilePath() };
+
+            auto oldAbsolutePath = fileInfo.absoluteFilePath();
+            auto oldFilename = fileInfo.fileName();
+            auto hash = oldFilename.left(SHA256_HASH_HEX_LENGTH);
+            auto fullExtension = oldFilename.mid(oldFilename.indexOf('.'));
+
+            qDebug() << "\tMoving" << oldAbsolutePath << "to" << oldAbsolutePath.replace(fullExtension, "");
+
+            bool renamed = oldFile.copy(_filesDirectory.filePath(hash));
+            if (!renamed) {
+                qWarning() << "\tCould not migrate pre-mapping file" << fileInfo.fileName();
+            } else {
+                qDebug() << "\tRenamed pre-mapping file" << fileInfo.fileName();
+
+                // add a new mapping with the old extension and a truncated version of the hash
+                const int TRUNCATED_HASH_NUM_CHAR = 16;
+                auto fakeFileName = "/" + hash.left(TRUNCATED_HASH_NUM_CHAR) + fullExtension;
+
+                qDebug() << "\tAdding a migration mapping from" << fakeFileName << "to" << hash;
+
+                auto it = _fileMappings.find(fakeFileName);
+                if (it == _fileMappings.end()) {
+                    _fileMappings[fakeFileName] = hash;
+
+                    if (writeMappingsToFile()) {
+                        // mapping added and persisted, we can remove the migrated file
+                        oldFile.remove();
+                        qDebug() << "\tMigration completed for" << oldFilename;
+                    }
+                } else {
+                    qDebug() << "\tCould not add migration mapping for" << hash << "since a mapping for" << fakeFileName
+                        << "already exists.";
+                }
+            }
+        }
+    }
+}
+
+void AssetServer::handleAssetMappingOperation(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
+    MessageID messageID;
+    message->readPrimitive(&messageID);
+
+    AssetMappingOperationType operationType;
+    message->readPrimitive(&operationType);
+
+    auto replyPacket = NLPacketList::create(PacketType::AssetMappingOperationReply, QByteArray(), true, true);
+    replyPacket->writePrimitive(messageID);
+
+    switch (operationType) {
+        case AssetMappingOperationType::Get: {
+            handleGetMappingOperation(*message, senderNode, *replyPacket);
+            break;
+        }
+        case AssetMappingOperationType::GetAll: {
+            handleGetAllMappingOperation(*message, senderNode, *replyPacket);
+            break;
+        }
+        case AssetMappingOperationType::Set: {
+            handleSetMappingOperation(*message, senderNode, *replyPacket);
+            break;
+        }
+        case AssetMappingOperationType::Delete: {
+            handleDeleteMappingsOperation(*message, senderNode, *replyPacket);
+            break;
+        }
+        case AssetMappingOperationType::Rename: {
+            handleRenameMappingOperation(*message, senderNode, *replyPacket);
+            break;
+        }
+    }
+
+    auto nodeList = DependencyManager::get<NodeList>();
+    nodeList->sendPacketList(std::move(replyPacket), *senderNode);
+}
+
+void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
+    QString assetPath = message.readString();
+
+    auto it = _fileMappings.find(assetPath);
+    if (it != _fileMappings.end()) {
+        auto assetHash = it->toString();
+        replyPacket.writePrimitive(AssetServerError::NoError);
+        replyPacket.write(QByteArray::fromHex(assetHash.toUtf8()));
+    } else {
+        replyPacket.writePrimitive(AssetServerError::AssetNotFound);
+    }
+}
+
+void AssetServer::handleGetAllMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
+    replyPacket.writePrimitive(AssetServerError::NoError);
+
+    auto count = _fileMappings.size();
+
+    replyPacket.writePrimitive(count);
+
+    for (auto it = _fileMappings.cbegin(); it != _fileMappings.cend(); ++ it) {
+        replyPacket.writeString(it.key());
+        replyPacket.write(QByteArray::fromHex(it.value().toString().toUtf8()));
+    }
+}
+
+void AssetServer::handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
+    if (senderNode->getCanRez()) {
+        QString assetPath = message.readString();
+
+        auto assetHash = message.read(SHA256_HASH_LENGTH).toHex();
+
+        if (setMapping(assetPath, assetHash)) {
+            replyPacket.writePrimitive(AssetServerError::NoError);
+        } else {
+            replyPacket.writePrimitive(AssetServerError::MappingOperationFailed);
+        }
+    } else {
+        replyPacket.writePrimitive(AssetServerError::PermissionDenied);
+    }
+}
+
+void AssetServer::handleDeleteMappingsOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
+    if (senderNode->getCanRez()) {
+        int numberOfDeletedMappings { 0 };
+        message.readPrimitive(&numberOfDeletedMappings);
+
+        QStringList mappingsToDelete;
+
+        for (int i = 0; i < numberOfDeletedMappings; ++i) {
+            mappingsToDelete << message.readString();
+        }
+
+        if (deleteMappings(mappingsToDelete)) {
+            replyPacket.writePrimitive(AssetServerError::NoError);
+        } else {
+            replyPacket.writePrimitive(AssetServerError::MappingOperationFailed);
+        }
+    } else {
+        replyPacket.writePrimitive(AssetServerError::PermissionDenied);
+    }
+}
+
+void AssetServer::handleRenameMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket) {
+    if (senderNode->getCanRez()) {
+        QString oldPath = message.readString();
+        QString newPath = message.readString();
+
+        if (renameMapping(oldPath, newPath)) {
+            replyPacket.writePrimitive(AssetServerError::NoError);
+        } else {
+            replyPacket.writePrimitive(AssetServerError::MappingOperationFailed);
+        }
+    } else {
+        replyPacket.writePrimitive(AssetServerError::PermissionDenied);
+    }
+}
+
 void AssetServer::handleAssetGetInfo(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
     QByteArray assetHash;
     MessageID messageID;
-    uint8_t extensionLength;
 
-    if (message->getSize() < qint64(SHA256_HASH_LENGTH + sizeof(messageID) + sizeof(extensionLength))) {
+    if (message->getSize() < qint64(SHA256_HASH_LENGTH + sizeof(messageID))) {
         qDebug() << "ERROR bad file request";
         return;
     }
 
     message->readPrimitive(&messageID);
     assetHash = message->readWithoutCopy(SHA256_HASH_LENGTH);
-    message->readPrimitive(&extensionLength);
-    QByteArray extension = message->read(extensionLength);
 
     auto replyPacket = NLPacket::create(PacketType::AssetGetInfoReply);
 
@@ -183,8 +323,8 @@ void AssetServer::handleAssetGetInfo(QSharedPointer<ReceivedMessage> message, Sh
     replyPacket->writePrimitive(messageID);
     replyPacket->write(assetHash);
 
-    QString fileName = QString(hexHash) + "." + extension;
-    QFileInfo fileInfo { _resourcesDirectory.filePath(fileName) };
+    QString fileName = QString(hexHash);
+    QFileInfo fileInfo { _filesDirectory.filePath(fileName) };
 
     if (fileInfo.exists() && fileInfo.isReadable()) {
         qDebug() << "Opening file: " << fileInfo.filePath();
@@ -201,39 +341,39 @@ void AssetServer::handleAssetGetInfo(QSharedPointer<ReceivedMessage> message, Sh
 
 void AssetServer::handleAssetGet(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
 
-    auto minSize = qint64(sizeof(MessageID) + SHA256_HASH_LENGTH + sizeof(uint8_t) + sizeof(DataOffset) + sizeof(DataOffset));
-    
+    auto minSize = qint64(sizeof(MessageID) + SHA256_HASH_LENGTH + sizeof(DataOffset) + sizeof(DataOffset));
+
     if (message->getSize() < minSize) {
         qDebug() << "ERROR bad file request";
         return;
     }
 
     // Queue task
-    auto task = new SendAssetTask(message, senderNode, _resourcesDirectory);
+    auto task = new SendAssetTask(message, senderNode, _filesDirectory);
     _taskPool.start(task);
 }
 
 void AssetServer::handleAssetUpload(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
-    
+
     if (senderNode->getCanRez()) {
         qDebug() << "Starting an UploadAssetTask for upload from" << uuidStringWithoutCurlyBraces(senderNode->getUUID());
-        
-        auto task = new UploadAssetTask(message, senderNode, _resourcesDirectory);
+
+        auto task = new UploadAssetTask(message, senderNode, _filesDirectory);
         _taskPool.start(task);
     } else {
         // this is a node the domain told us is not allowed to rez entities
         // for now this also means it isn't allowed to add assets
         // so return a packet with error that indicates that
-        
+
         auto permissionErrorPacket = NLPacket::create(PacketType::AssetUploadReply, sizeof(MessageID) + sizeof(AssetServerError));
-        
+
         MessageID messageID;
         message->readPrimitive(&messageID);
-        
+
         // write the message ID and a permission denied error
         permissionErrorPacket->writePrimitive(messageID);
         permissionErrorPacket->writePrimitive(AssetServerError::PermissionDenied);
-        
+
         // send off the packet
         auto nodeList = DependencyManager::get<NodeList>();
         nodeList->sendPacket(std::move(permissionErrorPacket), *senderNode);
@@ -242,19 +382,19 @@ void AssetServer::handleAssetUpload(QSharedPointer<ReceivedMessage> message, Sha
 
 void AssetServer::sendStatsPacket() {
     QJsonObject serverStats;
-    
+
     auto stats = DependencyManager::get<NodeList>()->sampleStatsForAllConnections();
-    
+
     for (const auto& stat : stats) {
         QJsonObject nodeStats;
         auto endTimeMs = std::chrono::duration_cast<std::chrono::milliseconds>(stat.second.endTime);
         QDateTime date = QDateTime::fromMSecsSinceEpoch(endTimeMs.count());
-        
+
         static const float USEC_PER_SEC = 1000000.0f;
         static const float MEGABITS_PER_BYTE = 8.0f / 1000000.0f; // Bytes => Mbits
         float elapsed = (float)(stat.second.endTime - stat.second.startTime).count() / USEC_PER_SEC; // sec
         float megabitsPerSecPerByte = MEGABITS_PER_BYTE / elapsed; // Bytes => Mb/s
-        
+
         QJsonObject connectionStats;
         connectionStats["1. Last Heard"] = date.toString();
         connectionStats["2. Est. Max (P/s)"] = stat.second.estimatedBandwith;
@@ -264,10 +404,10 @@ void AssetServer::sendStatsPacket() {
         connectionStats["6. Up (Mb/s)"] = stat.second.sentBytes * megabitsPerSecPerByte;
         connectionStats["7. Down (Mb/s)"] = stat.second.receivedBytes * megabitsPerSecPerByte;
         nodeStats["Connection Stats"] = connectionStats;
-        
+
         using Events = udt::ConnectionStats::Stats::Event;
         const auto& events = stat.second.events;
-        
+
         QJsonObject upstreamStats;
         upstreamStats["1. Sent (P/s)"] = stat.second.sendRate;
         upstreamStats["2. Sent Packets"] = stat.second.sentPackets;
@@ -279,7 +419,7 @@ void AssetServer::sendStatsPacket() {
         upstreamStats["8. Sent ACK2"] = events[Events::SentACK2];
         upstreamStats["9. Retransmitted"] = events[Events::Retransmission];
         nodeStats["Upstream Stats"] = upstreamStats;
-        
+
         QJsonObject downstreamStats;
         downstreamStats["1. Recvd (P/s)"] = stat.second.receiveRate;
         downstreamStats["2. Recvd Packets"] = stat.second.receivedPackets;
@@ -290,7 +430,7 @@ void AssetServer::sendStatsPacket() {
         downstreamStats["7. Recvd ACK2"] = events[Events::ReceivedACK2];
         downstreamStats["8. Duplicates"] = events[Events::Duplicate];
         nodeStats["Downstream Stats"] = downstreamStats;
-        
+
         QString uuid;
         auto nodelist = DependencyManager::get<NodeList>();
         if (stat.first == nodelist->getDomainHandler().getSockAddr()) {
@@ -301,10 +441,274 @@ void AssetServer::sendStatsPacket() {
             uuid = uuidStringWithoutCurlyBraces(node ? node->getUUID() : QUuid());
             nodeStats[USERNAME_UUID_REPLACEMENT_STATS_KEY] = uuid;
         }
-        
+
         serverStats[uuid] = nodeStats;
     }
-    
+
     // send off the stats packets
     ThreadedAssignment::addPacketStatsAndSendStatsPacket(serverStats);
 }
+
+static const QString MAP_FILE_NAME = "map.json";
+
+void AssetServer::loadMappingsFromFile() {
+
+    auto mapFilePath = _resourcesDirectory.absoluteFilePath(MAP_FILE_NAME);
+
+    QFile mapFile { mapFilePath };
+    if (mapFile.exists()) {
+        if (mapFile.open(QIODevice::ReadOnly)) {
+            QJsonParseError error;
+
+            auto jsonDocument = QJsonDocument::fromJson(mapFile.readAll(), &error);
+
+            if (error.error == QJsonParseError::NoError) {
+                _fileMappings = jsonDocument.object().toVariantHash();
+
+                // remove any mappings that don't match the expected format
+                auto it = _fileMappings.begin();
+                while (it != _fileMappings.end()) {
+                    bool shouldDrop = false;
+
+                    if (!isValidPath(it.key())) {
+                        qWarning() << "Will not keep mapping for" << it.key() << "since it is not a valid path.";
+                        shouldDrop = true;
+                    }
+
+                    if (!isValidHash(it.value().toString())) {
+                        qWarning() << "Will not keep mapping for" << it.key() << "since it does not have a valid hash.";
+                        shouldDrop = true;
+                    }
+
+                    if (shouldDrop) {
+                        it = _fileMappings.erase(it);
+                    } else {
+                        ++it;
+                    }
+                }
+
+                qInfo() << "Loaded" << _fileMappings.count() << "mappings from map file at" << mapFilePath;
+                return;
+            }
+        }
+
+        qCritical() << "Failed to read mapping file at" << mapFilePath << "- assignment will not continue.";
+        setFinished(true);
+    } else {
+        qInfo() << "No existing mappings loaded from file since no file was found at" << mapFilePath;
+    }
+}
+
+bool AssetServer::writeMappingsToFile() {
+    auto mapFilePath = _resourcesDirectory.absoluteFilePath(MAP_FILE_NAME);
+
+    QFile mapFile { mapFilePath };
+    if (mapFile.open(QIODevice::WriteOnly)) {
+        auto jsonObject = QJsonObject::fromVariantHash(_fileMappings);
+        QJsonDocument jsonDocument { jsonObject };
+
+        if (mapFile.write(jsonDocument.toJson()) != -1) {
+            qDebug() << "Wrote JSON mappings to file at" << mapFilePath;
+            return true;
+        } else {
+            qWarning() << "Failed to write JSON mappings to file at" << mapFilePath;
+        }
+    } else {
+        qWarning() << "Failed to open map file at" << mapFilePath;
+    }
+
+    return false;
+}
+
+bool AssetServer::setMapping(AssetPath path, AssetHash hash) {
+    path = path.trimmed();
+
+    if (!isValidPath(path)) {
+        qWarning() << "Cannot set a mapping for invalid path:" << path << "=>" << hash;
+        return false;
+    }
+
+    if (!isValidHash(hash)) {
+        qWarning() << "Cannot set a mapping for invalid hash" << path << "=>" << hash;
+        return false;
+    }
+
+    // remember what the old mapping was in case persistence fails
+    auto oldMapping = _fileMappings.value(path).toString();
+
+    // update the in memory QHash
+    _fileMappings[path] = hash;
+
+    // attempt to write to file
+    if (writeMappingsToFile()) {
+        // persistence succeeded, we are good to go
+        qDebug() << "Set mapping:" << path << "=>" << hash;
+        return true;
+    } else {
+        // failed to persist this mapping to file - put back the old one in our in-memory representation
+        if (oldMapping.isEmpty()) {
+            _fileMappings.remove(path);
+        } else {
+            _fileMappings[path] = oldMapping;
+        }
+
+        qWarning() << "Failed to persist mapping:" << path << "=>" << hash;
+
+        return false;
+    }
+}
+
+bool pathIsFolder(const AssetPath& path) {
+    return path.endsWith('/');
+}
+
+bool AssetServer::deleteMappings(AssetPathList& paths) {
+    // take a copy of the current mappings in case persistence of these deletes fails
+    auto oldMappings = _fileMappings;
+
+    // enumerate the paths to delete and remove them all
+    for (auto& path : paths) {
+
+        path = path.trimmed();
+
+        // figure out if this path will delete a file or folder
+        if (pathIsFolder(path)) {
+            // enumerate the in memory file mappings and remove anything that matches
+            auto it = _fileMappings.begin();
+            auto sizeBefore = _fileMappings.size();
+
+            while (it != _fileMappings.end()) {
+                if (it.key().startsWith(path)) {
+                    it = _fileMappings.erase(it);
+                } else {
+                    ++it;
+                }
+            }
+
+            auto sizeNow = _fileMappings.size();
+            if (sizeBefore != sizeNow) {
+                qDebug() << "Deleted" << sizeBefore - sizeNow << "mappings in folder: " << path;
+            } else {
+                qDebug() << "Did not find any mappings to delete in folder:" << path;
+            }
+
+        } else {
+            auto oldMapping = _fileMappings.take(path);
+            if (!oldMapping.isNull()) {
+                qDebug() << "Deleted a mapping:" << path << "=>" << oldMapping.toString();
+            } else {
+                qDebug() << "Unable to delete a mapping that was not found:" << path;
+            }
+        }
+    }
+
+    // deleted the old mappings, attempt to persist to file
+    if (writeMappingsToFile()) {
+        // persistence succeeded we are good to go
+        return true;
+    } else {
+        qWarning() << "Failed to persist deleted mappings, rolling back";
+
+        // we didn't delete the previous mapping, put it back in our in-memory representation
+        _fileMappings = oldMappings;
+
+        return false;
+    }
+}
+
+bool AssetServer::renameMapping(AssetPath oldPath, AssetPath newPath) {
+    oldPath = oldPath.trimmed();
+    newPath = newPath.trimmed();
+
+    if (!isValidPath(oldPath) || !isValidPath(newPath)) {
+        qWarning() << "Cannot perform rename with invalid paths - both should have leading forward slashes:"
+            << oldPath << "=>" << newPath;
+
+        return false;
+    }
+
+    // figure out if this rename is for a file or folder
+    if (pathIsFolder(oldPath)) {
+        if (!pathIsFolder(newPath)) {
+            // we were asked to rename a path to a folder to a path that isn't a folder, this is a fail
+            qWarning() << "Cannot rename mapping from folder path" << oldPath << "to file path" << newPath;
+
+            return false;
+        }
+
+        // take a copy of the old mappings
+        auto oldMappings = _fileMappings;
+
+        // iterate the current mappings and adjust any that matches the renamed folder
+        auto it = oldMappings.begin();
+
+        while (it != oldMappings.end()) {
+            if (it.key().startsWith(oldPath)) {
+                auto newKey = it.key();
+                newKey.replace(0, oldPath.size(), newPath);
+
+                // remove the old version from the in memory file mappings
+                _fileMappings.remove(it.key());
+                _fileMappings.insert(newKey, it.value());
+            }
+
+            ++it;
+        }
+
+        if (writeMappingsToFile()) {
+            // persisted the changed mappings, return success
+            qDebug() << "Renamed folder mapping:" << oldPath << "=>" << newPath;
+
+            return true;
+        } else {
+            // couldn't persist the renamed paths, rollback and return failure
+            _fileMappings = oldMappings;
+
+            qWarning() << "Failed to persist renamed folder mapping:" << oldPath << "=>" << newPath;
+
+            return false;
+        }
+    } else {
+        if (pathIsFolder(newPath)) {
+            // we were asked to rename a path to a file to a path that is a folder, this is a fail
+            qWarning() << "Cannot rename mapping from file path" << oldPath << "to folder path" << newPath;
+
+            return false;
+        }
+
+        // take the old hash to remove the old mapping
+        auto oldSourceMapping = _fileMappings.take(oldPath).toString();
+
+        // in case we're overwriting, keep the current destination mapping for potential rollback
+        auto oldDestinationMapping = _fileMappings.value(newPath);
+
+        if (!oldSourceMapping.isEmpty()) {
+            _fileMappings[newPath] = oldSourceMapping;
+
+            if (writeMappingsToFile()) {
+                // persisted the renamed mapping, return success
+                qDebug() << "Renamed mapping:" << oldPath << "=>" << newPath;
+
+                return true;
+            } else {
+                // we couldn't persist the renamed mapping, rollback and return failure
+                _fileMappings[oldPath] = oldSourceMapping;
+
+                if (!oldDestinationMapping.isNull()) {
+                    // put back the overwritten mapping for the destination path
+                    _fileMappings[newPath] = oldDestinationMapping.toString();
+                } else {
+                    // clear the new mapping
+                    _fileMappings.remove(newPath);
+                }
+
+                qDebug() << "Failed to persist renamed mapping:" << oldPath << "=>" << newPath;
+
+                return false;
+            }
+        } else {
+            // failed to find a mapping that was to be renamed, return failure
+            return false;
+        }
+    }
+}

assignment-client/src/assets/AssetServer.h

@@ -12,10 +12,10 @@
 #ifndef hifi_AssetServer_h
 #define hifi_AssetServer_h
 
-#include <QDir>
+#include <QtCore/QDir>
+#include <QtCore/QThreadPool>
 
 #include <ThreadedAssignment.h>
-#include <QThreadPool>
 
 #include "AssetUtils.h"
 #include "ReceivedMessage.h"
@@ -34,17 +34,39 @@ private slots:
     void handleAssetGetInfo(QSharedPointer<ReceivedMessage> packet, SharedNodePointer senderNode);
     void handleAssetGet(QSharedPointer<ReceivedMessage> packet, SharedNodePointer senderNode);
     void handleAssetUpload(QSharedPointer<ReceivedMessage> packetList, SharedNodePointer senderNode);
+    void handleAssetMappingOperation(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     
     void sendStatsPacket();
     
 private:
-    static void writeError(NLPacketList* packetList, AssetServerError error);
+    using Mappings = QVariantHash;
+
+    void handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
+    void handleGetAllMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
+    void handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
+    void handleDeleteMappingsOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
+    void handleRenameMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacketList& replyPacket);
+
+    // Mapping file operations must be called from main assignment thread only
+    void loadMappingsFromFile();
+    bool writeMappingsToFile();
+
+    /// Set the mapping for path to hash
+    bool setMapping(AssetPath path, AssetHash hash);
+
+    /// Delete mapping `path`. Returns `true` if deletion of mappings succeeds, else `false`.
+    bool deleteMappings(AssetPathList& paths);
+
+    /// Rename mapping from `oldPath` to `newPath`. Returns true if successful
+    bool renameMapping(AssetPath oldPath, AssetPath newPath);
+
+    void performMappingMigration();
+
+    Mappings _fileMappings;
+
     QDir _resourcesDirectory;
+    QDir _filesDirectory;
     QThreadPool _taskPool;
 };
 
-inline void writeError(NLPacketList* packetList, AssetServerError error) {
-    packetList->writePrimitive(error);
-}
-
 #endif

assignment-client/src/assets/SendAssetTask.cpp

@@ -33,13 +33,10 @@ SendAssetTask::SendAssetTask(QSharedPointer<ReceivedMessage> message, const Shar
 
 void SendAssetTask::run() {
     MessageID messageID;
-    uint8_t extensionLength;
     DataOffset start, end;
     
     _message->readPrimitive(&messageID);
     QByteArray assetHash = _message->read(SHA256_HASH_LENGTH);
-    _message->readPrimitive(&extensionLength);
-    QByteArray extension = _message->read(extensionLength);
 
     // `start` and `end` indicate the range of data to retrieve for the asset identified by `assetHash`.
     // `start` is inclusive, `end` is exclusive. Requesting `start` = 1, `end` = 10 will retrieve 9 bytes of data,
@@ -59,15 +56,15 @@ void SendAssetTask::run() {
     replyPacketList->writePrimitive(messageID);
 
     if (end <= start) {
-        writeError(replyPacketList.get(), AssetServerError::InvalidByteRange);
+        replyPacketList->writePrimitive(AssetServerError::InvalidByteRange);
     } else {
-        QString filePath = _resourcesDir.filePath(QString(hexHash) + "." + QString(extension));
+        QString filePath = _resourcesDir.filePath(QString(hexHash));
         
         QFile file { filePath };
 
         if (file.open(QIODevice::ReadOnly)) {
             if (file.size() < end) {
-                writeError(replyPacketList.get(), AssetServerError::InvalidByteRange);
+                replyPacketList->writePrimitive(AssetServerError::InvalidByteRange);
                 qCDebug(networking) << "Bad byte range: " << hexHash << " " << start << ":" << end;
             } else {
                 auto size = end - start;
@@ -80,7 +77,7 @@ void SendAssetTask::run() {
             file.close();
         } else {
             qCDebug(networking) << "Asset not found: " << filePath << "(" << hexHash << ")";
-            writeError(replyPacketList.get(), AssetServerError::AssetNotFound);
+            replyPacketList->writePrimitive(AssetServerError::AssetNotFound);
         }
     }
 

assignment-client/src/assets/UploadAssetTask.cpp

@@ -37,15 +37,10 @@ void UploadAssetTask::run() {
     MessageID messageID;
     buffer.read(reinterpret_cast<char*>(&messageID), sizeof(messageID));
     
-    uint8_t extensionLength;
-    buffer.read(reinterpret_cast<char*>(&extensionLength), sizeof(extensionLength));
-    
-    QByteArray extension = buffer.read(extensionLength);
-    
     uint64_t fileSize;
     buffer.read(reinterpret_cast<char*>(&fileSize), sizeof(fileSize));
     
-    qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes and extension" << extension << "from"
+    qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes from"
         << uuidStringWithoutCurlyBraces(_senderNode->getUUID());
     
     auto replyPacket = NLPacket::create(PacketType::AssetUploadReply);
@@ -62,17 +57,47 @@ void UploadAssetTask::run() {
         qDebug() << "Hash for uploaded file from" << uuidStringWithoutCurlyBraces(_senderNode->getUUID())
             << "is: (" << hexHash << ") ";
         
-        QFile file { _resourcesDir.filePath(QString(hexHash)) + "." + QString(extension) };
+        QFile file { _resourcesDir.filePath(QString(hexHash)) };
+
+        bool existingCorrectFile = false;
         
         if (file.exists()) {
-            qDebug() << "[WARNING] This file already exists: " << hexHash;
-        } else {
-            file.open(QIODevice::WriteOnly);
-            file.write(fileData);
-            file.close();
+            // check if the local file has the correct contents, otherwise we overwrite
+            if (file.open(QIODevice::ReadOnly) && hashData(file.readAll()) == hash) {
+                qDebug() << "Not overwriting existing verified file: " << hexHash;
+
+                existingCorrectFile = true;
+
+                replyPacket->writePrimitive(AssetServerError::NoError);
+                replyPacket->write(hash);
+            } else {
+                qDebug() << "Overwriting an existing file whose contents did not match the expected hash: " << hexHash;
+                file.close();
+            }
         }
-        replyPacket->writePrimitive(AssetServerError::NoError);
-        replyPacket->write(hash);
+
+        if (!existingCorrectFile) {
+            if (file.open(QIODevice::WriteOnly) && file.write(fileData) == qint64(fileSize)) {
+                qDebug() << "Wrote file" << hexHash << "to disk. Upload complete";
+                file.close();
+
+                replyPacket->writePrimitive(AssetServerError::NoError);
+                replyPacket->write(hash);
+            } else {
+                qWarning() << "Failed to upload or write to file" << hexHash << " - upload failed.";
+
+                // upload has failed - remove the file and return an error
+                auto removed = file.remove();
+
+                if (!removed) {
+                    qWarning() << "Removal of failed upload file" << hexHash << "failed.";
+                }
+                
+                replyPacket->writePrimitive(AssetServerError::FileOperationFailed);
+            }
+        }
+
+
     }
     
     auto nodeList = DependencyManager::get<NodeList>();

assignment-client/src/audio/AudioMixer.cpp

@@ -369,14 +369,6 @@ void AudioMixer::sendAudioEnvironmentPacket(SharedNodePointer node) {
             reverbTime = _zoneReverbSettings[i].reverbTime;
             wetLevel = _zoneReverbSettings[i].wetLevel;
 
-            // Modulate wet level with distance to wall
-            float MIN_ATTENUATION_DISTANCE = 2.0f;
-            float MAX_ATTENUATION = -12; // dB
-            glm::vec3 distanceToWalls = (box.getDimensions() / 2.0f) - glm::abs(streamPosition - box.calcCenter());
-            float distanceToClosestWall = glm::min(distanceToWalls.x, distanceToWalls.z);
-            if (distanceToClosestWall < MIN_ATTENUATION_DISTANCE) {
-                wetLevel += MAX_ATTENUATION * (1.0f - distanceToClosestWall / MIN_ATTENUATION_DISTANCE);
-            }
             break;
         }
     }

cmake/externals/oglplus/CMakeLists.txt

@@ -4,7 +4,7 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 include(ExternalProject)
 ExternalProject_Add(
     ${EXTERNAL_NAME}
-    URL http://iweb.dl.sourceforge.net/project/oglplus/oglplus-0.63.x/oglplus-0.63.0.zip
+    URL http://hifi-public.s3.amazonaws.com/dependencies/oglplus-0.63.0.zip
     URL_MD5 de984ab245b185b45c87415c0e052135
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""

cmake/externals/openvr/CMakeLists.txt

@@ -7,8 +7,8 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
 ExternalProject_Add(
   ${EXTERNAL_NAME}
-  URL https://github.com/ValveSoftware/openvr/archive/v0.9.15.zip
-  URL_MD5 0ff8560b49b6da1150fcc47360e8ceca
+  URL https://github.com/ValveSoftware/openvr/archive/v0.9.19.zip
+  URL_MD5 843f9dde488584d8af1f3ecf2252b4e0
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND ""

domain-server/resources/describe-settings.json

@@ -186,6 +186,15 @@
           "help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.",
           "default": "",
           "advanced": true
+        },
+        {
+          "name": "max_bandwidth",
+          "type": "double",
+          "label": "Max Bandwidth Per User",
+          "help": "The maximum upstream bandwidth each user can use (in Mb/s).",
+          "placeholder": "10.0",
+          "default": "",
+          "advanced": true
         }
       ]
     },
@@ -299,7 +308,7 @@
           "name": "reverb",
           "type": "table",
           "label": "Reverb Settings",
-          "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet level of -10 db. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet level of -5 db.",
+          "help": "In this table you can set reverb levels for audio zones.  For a medium-sized (e.g., 100 square meter) meeting room, try a decay time of around 1.5 seconds and a wet/dry mix of 25%. For an airplane hangar or cathedral, try a decay time of 4 seconds and a wet/dry mix of 50%.",
           "numbered": true,
           "columns": [
             {
@@ -316,9 +325,9 @@
             },
             {
               "name": "wet_level",
-              "label": "Wet Level",
+              "label": "Wet/Dry Mix",
               "can_set": true,
-              "placeholder": "(in db)"
+              "placeholder": "(in percent)"
             }
           ]
         }

domain-server/src/DomainServer.cpp

@@ -103,8 +103,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
         qDebug() << "Setting up LimitedNodeList and assignments.";
         setupNodeListAndAssignments();
 
-        loadExistingSessionsFromSettings();
-
         // setup automatic networking settings with data server
         setupAutomaticNetworking();
 
@@ -681,7 +679,12 @@ unsigned int DomainServer::countConnectedUsers() {
 }
 
 QUrl DomainServer::oauthRedirectURL() {
-    return QString("https://%1:%2/oauth").arg(_hostname).arg(_httpsManager->serverPort());
+    if (_httpsManager) {
+        return QString("https://%1:%2/oauth").arg(_hostname).arg(_httpsManager->serverPort());
+    } else {
+        qWarning() << "Attempting to determine OAuth re-direct URL with no HTTPS server configured.";
+        return QUrl();
+    }
 }
 
 const QString OAUTH_CLIENT_ID_QUERY_KEY = "client_id";
@@ -1642,10 +1645,11 @@ bool DomainServer::isAuthenticatedRequest(HTTPConnection* connection, const QUrl
             // add it to the set so we can handle the callback from the OAuth provider
             _webAuthenticationStateSet.insert(stateUUID);
 
-            QUrl oauthRedirectURL = oauthAuthorizationURL(stateUUID);
+            QUrl authURL = oauthAuthorizationURL(stateUUID);
 
             Headers redirectHeaders;
-            redirectHeaders.insert("Location", oauthRedirectURL.toEncoded());
+
+            redirectHeaders.insert("Location", authURL.toEncoded());
 
             connection->respond(HTTPConnection::StatusCode302,
                                 QByteArray(), HTTPConnection::DefaultContentType, redirectHeaders);
@@ -1723,7 +1727,6 @@ QNetworkReply* DomainServer::profileRequestGivenTokenReply(QNetworkReply* tokenR
     return NetworkAccessManager::getInstance().get(profileRequest);
 }
 
-const QString DS_SETTINGS_SESSIONS_GROUP = "web-sessions";
 Headers DomainServer::setupCookieHeadersFromProfileReply(QNetworkReply* profileReply) {
     Headers cookieHeaders;
 
@@ -1737,10 +1740,6 @@ Headers DomainServer::setupCookieHeadersFromProfileReply(QNetworkReply* profileR
     DomainServerWebSessionData sessionData(userObject);
     _cookieSessionHash.insert(cookieUUID, sessionData);
 
-    // persist the cookie to settings file so we can get it back on DS relaunch
-    QStringList path = QStringList() << DS_SETTINGS_SESSIONS_GROUP << cookieUUID.toString();
-    Setting::Handle<QVariant>(path).set(QVariant::fromValue(sessionData));
-
     // setup expiry for cookie to 1 month from today
     QDateTime cookieExpiry = QDateTime::currentDateTimeUtc().addMonths(1);
 
@@ -1757,18 +1756,6 @@ Headers DomainServer::setupCookieHeadersFromProfileReply(QNetworkReply* profileR
     return cookieHeaders;
 }
 
-void DomainServer::loadExistingSessionsFromSettings() {
-    // read data for existing web sessions into memory so existing sessions can be leveraged
-    Settings domainServerSettings;
-    domainServerSettings.beginGroup(DS_SETTINGS_SESSIONS_GROUP);
-
-    foreach(const QString& uuidKey, domainServerSettings.childKeys()) {
-        _cookieSessionHash.insert(QUuid(uuidKey),
-                                  domainServerSettings.value(uuidKey).value<DomainServerWebSessionData>());
-        qDebug() << "Pulled web session from settings - cookie UUID is" << uuidKey;
-    }
-}
-
 void DomainServer::refreshStaticAssignmentAndAddToQueue(SharedAssignmentPointer& assignment) {
     QUuid oldUUID = assignment->getUUID();
     assignment->resetUUID();

examples/airship/airship.js

@@ -0,0 +1,301 @@
+//
+//  airship.js
+//
+//  Animates a pirate airship that chases people and shoots cannonballs at them
+//
+//  Created by Philip Rosedale on March 7, 2016
+//  Copyright 2016 High Fidelity, Inc.
+//  
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+(function () {
+    var entityID,
+        minimumDelay = 100,       // milliseconds
+        distanceScale = 2.0,      //  distance at which 100% chance of hopping
+        timeScale = 300.0,          // crash
+        hopStrength = 0.4,        //  meters / second
+        spotlight = null,
+        wantDebug = false,
+        timeoutID = undefined,
+        bullet = null,
+        particles = null,
+        nearbyAvatars = 0,
+        nearbyAvatarsInRange = 0,
+        averageAvatarLocation = { x: 0, y: 0, z: 0 },
+        properties,
+        lightTimer = 0,
+        lightTimeoutID = undefined,
+        audioInjector = null;
+
+    var HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
+    var cannonSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "philip/cannonShot.wav");
+    var explosionSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "philip/explosion.wav");
+
+    var NO_SHOOT_COLOR = { red: 100, green: 100, blue: 100 };
+
+    var MAX_TARGET_RANGE = 200; 
+
+    function printDebug(message) {
+        if (wantDebug) {
+            print(message);
+        }
+    }
+
+    var LIGHT_UPDATE_INTERVAL = 50;
+    var LIGHT_LIFETIME = 700;
+
+    function randomVector(size) {
+        return { x: (Math.random() - 0.5) * size, 
+                 y: (Math.random() - 0.5) * size,
+                 z: (Math.random() - 0.5) * size };
+    }
+
+    function makeLight(parent, position, colorDivisor) {
+        //  Create a flickering light somewhere for a while
+        if (spotlight !== null) {
+            // light still exists, do nothing
+            printDebug("light still there");
+            return;
+        }
+        printDebug("making light");
+
+        var colorIndex = 180 + Math.random() * 50;
+
+        spotlight = Entities.addEntity({
+                    type: "Light",
+                    name: "Test Light",
+                    intensity: 50.0,
+                    falloffRadius: 20.0,
+                    dimensions: {
+                        x: 150,
+                        y: 150,
+                        z: 150
+                    },
+                    position: position,
+                    parentID: parent,
+                    color: {
+                        red: colorIndex,
+                        green: colorIndex / colorDivisor,
+                        blue: 0
+                    },
+                    lifetime:  LIGHT_LIFETIME * 2
+                });
+
+        lightTimer = 0;
+        lightTimeoutID = Script.setTimeout(updateLight, LIGHT_UPDATE_INTERVAL);
+        
+    };
+
+    function updateLight() {
+        lightTimer += LIGHT_UPDATE_INTERVAL;
+        if ((spotlight !== null) && (lightTimer > LIGHT_LIFETIME)) {
+            printDebug("deleting light!");
+            Entities.deleteEntity(spotlight);
+            spotlight = null;
+        } else {
+            Entities.editEntity(spotlight, {
+                intensity: 5 + Math.random() * 50,
+                falloffRadius:  5 + Math.random() * 10 
+            });
+            lightTimeoutID = Script.setTimeout(updateLight, LIGHT_UPDATE_INTERVAL);
+        }
+    }
+
+    function move() {
+        
+        var HOVER_DISTANCE = 30.0;
+        var RUN_TOWARD_STRENGTH = 0.002;
+        var VELOCITY_FOLLOW_RATE = 0.01;
+
+        var range = Vec3.distance(properties.position, averageAvatarLocation);
+        var impulse = { x: 0, y: 0, z: 0 };
+
+        //  move in the XZ plane
+        var away = Vec3.subtract(properties.position, averageAvatarLocation);
+        away.y = 0.0;
+
+        if (range > HOVER_DISTANCE) {
+            impulse = Vec3.multiply(-RUN_TOWARD_STRENGTH, Vec3.normalize(away));
+        }
+        
+        var rotation = Quat.rotationBetween(Vec3.UNIT_NEG_Z, properties.velocity);
+        Entities.editEntity(entityID, {velocity: Vec3.sum(properties.velocity, impulse), rotation: Quat.mix(properties.rotation, rotation, VELOCITY_FOLLOW_RATE)});
+    }
+
+    
+    function countAvatars() {
+        var workQueue = AvatarList.getAvatarIdentifiers();
+        var averageLocation = {x: 0, y: 0, z: 0};
+        var summed = 0;
+        var inRange = 0;
+        for (var i = 0; i < workQueue.length; i++) {
+            var avatar = AvatarList.getAvatar(workQueue[i]), avatarPosition = avatar && avatar.position;
+            if (avatarPosition) {
+                averageLocation = Vec3.sum(averageLocation, avatarPosition);
+                summed++;
+                if (Vec3.distance(avatarPosition, properties.position) < MAX_TARGET_RANGE) {
+                    inRange++;
+                }
+            }
+        }
+        if (summed > 0) {
+            averageLocation = Vec3.multiply(1 / summed, averageLocation);
+        }
+        nearbyAvatars = summed;
+        nearbyAvatarsInRange = inRange;
+        averageAvatarLocation = averageLocation;
+
+        //printDebug("  Avatars: " + summed + "in range: " + nearbyAvatarsInRange);
+        //Vec3.print(" location: ", averageAvatarLocation);
+
+        return; 
+    }
+
+    function shoot() {
+        if (bullet !== null) {
+           return;
+        }
+        if (Vec3.distance(MyAvatar.position, properties.position) > MAX_TARGET_RANGE) {
+            return;
+        }
+
+        var SPEED = 7.5;
+        var GRAVITY = -2.0;
+        var DIAMETER = 0.5;
+        var direction = Vec3.subtract(MyAvatar.position, properties.position);
+        var range = Vec3.distance(MyAvatar.position, properties.position);
+        var timeOfFlight = range / SPEED;
+
+        var fall = 0.5 * -GRAVITY * (timeOfFlight * timeOfFlight);
+
+        var velocity = Vec3.multiply(SPEED, Vec3.normalize(direction));
+        velocity.y += 0.5 * fall / timeOfFlight * 2.0;
+
+        var DISTANCE_TO_DECK = 3;
+        var bulletStart = properties.position;
+        bulletStart.y -= DISTANCE_TO_DECK;
+
+        makeLight(entityID, Vec3.sum(properties.position, randomVector(10.0)), 2);
+
+        bullet = Entities.addEntity({ 
+            type: "Sphere",
+            name: "cannonball",
+            position: properties.position,
+            dimensions: { x: DIAMETER, y: DIAMETER, z: DIAMETER },
+            color: { red: 10, green: 10, blue: 10 },
+            velocity: velocity,
+            damping: 0.01,
+            dynamic: true,
+            ignoreForCollisions: true,
+            gravity: { x: 0, y: GRAVITY, z: 0 },
+            lifetime: timeOfFlight * 2
+        });
+
+        Audio.playSound(cannonSound, {
+            position: Vec3.sum(MyAvatar.position, velocity),
+            volume: 1.0
+        });
+        makeParticles(properties.position, bullet, timeOfFlight * 2);
+        Script.setTimeout(explode, timeOfFlight * 1000);
+    }
+
+    function explode() {
+         var properties = Entities.getEntityProperties(bullet);
+         var direction = Vec3.normalize(Vec3.subtract(MyAvatar.position, properties.position));
+         makeLight(null, properties.position, 10);
+         Audio.playSound(explosionSound, { position: Vec3.sum(MyAvatar.position, direction), volume: 1.0 }); 
+         bullet = null;
+    }
+
+
+    function maybe() {  // every user checks their distance and tries to claim if close enough.
+        var PROBABILITY_OF_SHOOT = 0.015;
+        properties = Entities.getEntityProperties(entityID);
+        countAvatars();
+
+        if (nearbyAvatars && (Math.random() < 1 / nearbyAvatars)) {
+            move();
+        }
+
+        if (nearbyAvatarsInRange && (Math.random() < PROBABILITY_OF_SHOOT / nearbyAvatarsInRange)) {
+            shoot();
+        }
+
+        var TIME_TO_NEXT_CHECK = 33;
+        timeoutID = Script.setTimeout(maybe, TIME_TO_NEXT_CHECK);
+    }
+
+    this.preload = function (givenEntityID) {
+        printDebug("preload airship v1...");
+
+        entityID = givenEntityID;
+        properties = Entities.getEntityProperties(entityID);
+        timeoutID = Script.setTimeout(maybe, minimumDelay);
+    };
+
+    this.unload = function () {
+         printDebug("unload airship...");
+        if (timeoutID !== undefined) {
+            Script.clearTimeout(timeoutID);
+        }
+        if (lightTimeoutID !== undefined) {
+            Script.clearTimeout(lightTimeoutID);
+        }
+        if (spotlight !== null) {
+            Entities.deleteEntity(spotlight);
+        }
+    };
+
+    function makeParticles(position, parent, lifespan) {
+        particles = Entities.addEntity({
+            type: 'ParticleEffect',
+            position: position,  
+            parentID: parent,
+            color: {
+                red: 70,
+                green: 70,
+                blue: 70
+            },
+            isEmitting: 1,
+            maxParticles: 1000,
+            lifetime: lifespan,
+            lifespan: lifespan / 3,   
+            emitRate: 80,
+            emitSpeed: 0,
+            speedSpread: 1.0,
+            emitRadiusStart: 1,
+            polarStart: -Math.PI/8,
+            polarFinish: Math.PI/8,
+            azimuthStart: -Math.PI/4,
+            azimuthFinish: Math.PI/4,
+            emitAcceleration: {  x: 0, y: 0, z: 0 },
+            particleRadius: 0.25,
+            radiusSpread: 0.1,
+            radiusStart: 0.3,
+            radiusFinish: 0.15,
+            colorSpread: {
+                red: 100,
+                green: 100,
+                blue: 0
+            },
+            colorStart: {
+                red: 125,
+                green: 125,
+                blue: 125
+            },
+             colorFinish: {
+                red: 10,
+                green: 10,
+                blue: 10
+            },
+            alpha: 0.5,
+            alphaSpread: 0,
+            alphaStart: 1,
+            alphaFinish: 0,
+            emitterShouldTrail: true,
+            textures: 'https://hifi-public.s3.amazonaws.com/alan/Particles/Particle-Sprite-Smoke-1.png'
+        });
+    }
+})

examples/airship/makeAirship.js

@@ -0,0 +1,59 @@
+//  makeAirship.js
+//  
+// //  Created by Philip Rosedale on March 7, 2016
+//  Copyright 2016 High Fidelity, Inc.
+//  
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+
+var SIZE = 0.2; 
+var TYPE = "Model";            //   Right now this can be "Box" or "Model" or "Sphere"
+
+var MODEL_URL = "https://s3.amazonaws.com/hifi-public/philip/airship_compact.fbx"
+
+var MODEL_DIMENSION = { x: 19.257, y: 24.094, z: 40.3122 };
+var ENTITY_URL = "https://s3.amazonaws.com/hifi-public/scripts/airship/airship.js";
+
+
+var LIFETIME = 3600 * 48;            
+
+var GRAVITY = { x: 0, y: 0, z: 0 };
+var DAMPING = 0.05;
+var ANGULAR_DAMPING = 0.01;
+
+var collidable = true; 
+var gravity = true; 
+
+var HOW_FAR_IN_FRONT_OF_ME = 30;
+var HOW_FAR_ABOVE_ME = 15;
+
+var leaveBehind = true;
+
+var shipLocation = Vec3.sum(MyAvatar.position, Vec3.multiply(HOW_FAR_IN_FRONT_OF_ME, Quat.getFront(Camera.orientation)));
+shipLocation.y += HOW_FAR_ABOVE_ME;
+
+
+var airship = Entities.addEntity({ 
+            type: TYPE,
+            modelURL: MODEL_URL,
+            name: "airship",
+            position: shipLocation,
+            dimensions: (TYPE == "Model") ? MODEL_DIMENSION : { x: SIZE, y: SIZE, z: SIZE },       
+            damping: DAMPING,
+            angularDamping: ANGULAR_DAMPING,
+            gravity: (gravity ? GRAVITY : { x: 0, y: 0, z: 0}),
+            dynamic: collidable,
+            lifetime: LIFETIME, 
+            animation: {url: MODEL_URL, running: true, currentFrame: 0, loop: true},
+            script: ENTITY_URL
+        });
+
+function scriptEnding() {
+    if (!leaveBehind) {
+        Entities.deleteEntity(airship);
+    }
+}
+
+Script.scriptEnding.connect(scriptEnding);

examples/directory.js

@@ -53,7 +53,6 @@ var toolBar = (function() {
         browseDirectoryButton;
 
     function initialize() {
-        ToolBar.SPACING = 16;
         toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.directory.toolbar", function(windowDimensions, toolbar) {
             return {
                 x: windowDimensions.x - 8 - toolbar.width,
@@ -61,11 +60,18 @@ var toolBar = (function() {
             };
         });
         browseDirectoryButton = toolBar.addTool({
-            imageURL: toolIconUrl + "directory.svg",
+            imageURL: toolIconUrl + "directory-01.svg",
+            subImage: {
+                x: 0,
+                y: Tool.IMAGE_WIDTH,
+                width: Tool.IMAGE_WIDTH,
+                height: Tool.IMAGE_HEIGHT
+            },
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
             visible: true,
+            showButtonDown: true
         });
 
         toolBar.showTool(browseDirectoryButton, true);

examples/edit.js

@@ -180,7 +180,6 @@ var toolBar = (function() {
         newTextButton,
         newWebButton,
         newZoneButton,
-        newPolyVoxButton,
         newParticleButton
 
     function initialize() {
@@ -191,10 +190,8 @@ var toolBar = (function() {
             };
         });
 
-
-
         activeButton = toolBar.addTool({
-            imageURL: toolIconUrl + "edit-status.svg",
+            imageURL: toolIconUrl + "edit-01.svg",
             subImage: {
                 x: 0,
                 y: Tool.IMAGE_WIDTH,
@@ -208,7 +205,7 @@ var toolBar = (function() {
         }, true, false);
 
         newModelButton = toolBar.addTool({
-            imageURL: toolIconUrl + "upload.svg",
+            imageURL: toolIconUrl + "upload-01.svg",
             subImage: {
                 x: 0,
                 y: Tool.IMAGE_WIDTH,
@@ -218,11 +215,12 @@ var toolBar = (function() {
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
+            showButtonDown: true,
             visible: false
         });
 
         newCubeButton = toolBar.addTool({
-            imageURL: toolIconUrl + "add-cube.svg",
+            imageURL: toolIconUrl + "cube-01.svg",
             subImage: {
                 x: 0,
                 y: Tool.IMAGE_WIDTH,
@@ -232,11 +230,12 @@ var toolBar = (function() {
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
+            showButtonDown: true,
             visible: false
         });
 
         newSphereButton = toolBar.addTool({
-            imageURL: toolIconUrl + "add-sphere.svg",
+            imageURL: toolIconUrl + "sphere-01.svg",
             subImage: {
                 x: 0,
                 y: Tool.IMAGE_WIDTH,
@@ -246,11 +245,12 @@ var toolBar = (function() {
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
+            showButtonDown: true,
             visible: false
         });
 
         newLightButton = toolBar.addTool({
-            imageURL: toolIconUrl + "light.svg",
+            imageURL: toolIconUrl + "light-01.svg",
             subImage: {
                 x: 0,
                 y: Tool.IMAGE_WIDTH,
@@ -260,11 +260,12 @@ var toolBar = (function() {
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
+            showButtonDown: true,
             visible: false
         });
 
         newTextButton = toolBar.addTool({
-            imageURL: toolIconUrl + "add-text.svg",
+            imageURL: toolIconUrl + "text-01.svg",
             subImage: {
                 x: 0,
                 y: Tool.IMAGE_WIDTH,
@@ -274,62 +275,52 @@ var toolBar = (function() {
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
+            showButtonDown: true,
             visible: false
         });
 
         newWebButton = toolBar.addTool({
-            imageURL: "https://hifi-public.s3.amazonaws.com/images/www.svg",
+            imageURL: toolIconUrl + "web-01.svg",
             subImage: {
                 x: 0,
-                y: 0,
-                width: 128,
-                height: 128
+                y: Tool.IMAGE_WIDTH,
+                width: Tool.IMAGE_WIDTH,
+                height: Tool.IMAGE_HEIGHT
             },
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
+            showButtonDown: true,
             visible: false
         });
 
         newZoneButton = toolBar.addTool({
-            imageURL: toolIconUrl + "zonecube_text.svg",
+            imageURL: toolIconUrl + "zone-01.svg",
             subImage: {
                 x: 0,
-                y: 128,
-                width: 128,
-                height: 128
-            },
-            width: toolWidth,
-            height: toolHeight,
-            alpha: 0.9,
-            visible: false
-        });
-
-        newPolyVoxButton = toolBar.addTool({
-            imageURL: toolIconUrl + "polyvox.svg",
-            subImage: {
-                x: 0,
-                y: 0,
-                width: 256,
-                height: 256
+                y: Tool.IMAGE_WIDTH,
+                width: Tool.IMAGE_WIDTH,
+                height: Tool.IMAGE_HEIGHT
             },
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
+            showButtonDown: true,
             visible: false
         });
 
         newParticleButton = toolBar.addTool({
-            imageURL: toolIconUrl + "particle.svg",
+            imageURL: toolIconUrl + "particle-01.svg",
             subImage: {
                 x: 0,
-                y: 0,
-                width: 256,
-                height: 256
+                y: Tool.IMAGE_WIDTH,
+                width: Tool.IMAGE_WIDTH,
+                height: Tool.IMAGE_HEIGHT
             },
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
+            showButtonDown: true,
             visible: false
         });
 
@@ -379,7 +370,6 @@ var toolBar = (function() {
         toolBar.showTool(newTextButton, doShow);
         toolBar.showTool(newWebButton, doShow);
         toolBar.showTool(newZoneButton, doShow);
-        toolBar.showTool(newPolyVoxButton, doShow);
         toolBar.showTool(newParticleButton, doShow);
     };
 
@@ -421,7 +411,6 @@ var toolBar = (function() {
         return entityID;
     }
 
-    var newModelButtonDown = false;
     that.mousePressEvent = function(event) {
         var clickedOverlay,
             url,
@@ -442,14 +431,14 @@ var toolBar = (function() {
             return true;
         }
 
-        // Handle these two buttons in the mouseRelease event handler so that we don't suppress a mouseRelease event from
-        // occurring when showing a modal dialog.
         if (newModelButton === toolBar.clicked(clickedOverlay)) {
-            newModelButtonDown = true;
+            url = Window.prompt("Model URL", modelURLs[Math.floor(Math.random() * modelURLs.length)]);
+            if (url !== null && url !== "") {
+                addModel(url);
+            }
             return true;
         }
 
-
         if (newCubeButton === toolBar.clicked(clickedOverlay)) {
             createNewEntity({
                 type: "Box",
@@ -551,92 +540,6 @@ var toolBar = (function() {
             return true;
         }
 
-        if (newPolyVoxButton === toolBar.clicked(clickedOverlay)) {
-            var polyVoxId = createNewEntity({
-                type: "PolyVox",
-                dimensions: {
-                    x: 10,
-                    y: 10,
-                    z: 10
-                },
-                voxelVolumeSize: {
-                    x: 16,
-                    y: 16,
-                    z: 16
-                },
-                voxelSurfaceStyle: 2
-            });
-            for (var x = 1; x <= 14; x++) {
-                Entities.setVoxel(polyVoxId, {
-                    x: x,
-                    y: 1,
-                    z: 1
-                }, 255);
-                Entities.setVoxel(polyVoxId, {
-                    x: x,
-                    y: 14,
-                    z: 1
-                }, 255);
-                Entities.setVoxel(polyVoxId, {
-                    x: x,
-                    y: 1,
-                    z: 14
-                }, 255);
-                Entities.setVoxel(polyVoxId, {
-                    x: x,
-                    y: 14,
-                    z: 14
-                }, 255);
-            }
-            for (var y = 2; y <= 13; y++) {
-                Entities.setVoxel(polyVoxId, {
-                    x: 1,
-                    y: y,
-                    z: 1
-                }, 255);
-                Entities.setVoxel(polyVoxId, {
-                    x: 14,
-                    y: y,
-                    z: 1
-                }, 255);
-                Entities.setVoxel(polyVoxId, {
-                    x: 1,
-                    y: y,
-                    z: 14
-                }, 255);
-                Entities.setVoxel(polyVoxId, {
-                    x: 14,
-                    y: y,
-                    z: 14
-                }, 255);
-            }
-            for (var z = 2; z <= 13; z++) {
-                Entities.setVoxel(polyVoxId, {
-                    x: 1,
-                    y: 1,
-                    z: z
-                }, 255);
-                Entities.setVoxel(polyVoxId, {
-                    x: 14,
-                    y: 1,
-                    z: z
-                }, 255);
-                Entities.setVoxel(polyVoxId, {
-                    x: 1,
-                    y: 14,
-                    z: z
-                }, 255);
-                Entities.setVoxel(polyVoxId, {
-                    x: 14,
-                    y: 14,
-                    z: z
-                }, 255);
-            }
-
-
-            return true;
-        }
-
         if (newParticleButton === toolBar.clicked(clickedOverlay)) {
             createNewEntity({
                 type: "ParticleEffect",
@@ -656,26 +559,8 @@ var toolBar = (function() {
         return false;
     };
 
-    that.mouseReleaseEvent = function(event) {
-        var handled = false;
-        if (newModelButtonDown) {
-            var clickedOverlay = Overlays.getOverlayAtPoint({
-                x: event.x,
-                y: event.y
-            });
-            if (newModelButton === toolBar.clicked(clickedOverlay)) {
-                url = Window.prompt("Model URL", modelURLs[Math.floor(Math.random() * modelURLs.length)]);
-                if (url !== null && url !== "") {
-                    addModel(url);
-                }
-                handled = true;
-            }
-        }
-
-        newModelButtonDown = false;
-
-
-        return handled;
+    that.mouseReleaseEvent = function (event) {
+        return false;
     }
 
     Window.domainChanged.connect(function() {

examples/entityScripts/virtualBaton/batonSimpleEntityScript.js

@@ -0,0 +1,96 @@
+(function() {
+    Script.include("../../libraries/virtualBaton.js");
+    Script.include("../../libraries/utils.js");
+
+    var _this = this;
+
+
+    this.startUpdate = function() {
+        print("EBL START UPDATE");
+        Entities.editEntity(_this.batonOwnerIndicator, {
+            visible: true
+        });
+
+        // Change color of box
+        Entities.editEntity(_this.entityID, {
+            color: randomColor()
+        });
+
+        _this.position = Entities.getEntityProperties(_this.entityID, "position").position;
+        _this.debugLightProperties.position = Vec3.sum(_this.position, {x: 0, y: 1, z: 0});
+        _this.debugLightProperties.color = randomColor();
+        var debugLight = Entities.addEntity(_this.debugLightProperties);
+        Script.setTimeout(function() {
+            Entities.deleteEntity(debugLight);
+        }, 500);
+
+    }
+
+    this.maybeClaim = function() {
+        print("EBL MAYBE CLAIM");
+        if (_this.isBatonOwner === true) {
+            _this.isBatonOwner = false;
+        }
+        Entities.editEntity(_this.batonOwnerIndicator, {
+            visible: false
+        });
+        baton.claim(_this.startUpdate, _this.maybeClaim);
+    }
+
+    this.unload = function() {
+        print("EBL UNLOAD");
+        baton.unload();
+        Entities.deleteEntity(_this.batonOwnerIndicator);
+    }
+
+
+    this.preload = function(entityID) {
+        print("EBL Preload!!");
+        _this.entityID = entityID;
+        _this.setupDebugEntities();
+
+        baton = virtualBaton({
+            batonName: "batonSimpleEntityScript:" + _this.entityID
+        });
+        _this.isBatonOwner = false;
+        _this.maybeClaim();
+
+    }
+
+
+    this.setupDebugEntities = function() {
+        _this.batonOwnerIndicator = Entities.addEntity({
+            type: "Box",
+            color: {
+                red: 200,
+                green: 10,
+                blue: 200
+            },
+            position: Vec3.sum(MyAvatar.position, {
+                x: 0,
+                y: 1,
+                z: 0
+            }),
+            dimensions: {
+                x: 0.5,
+                y: 1,
+                z: 0
+            },
+            parentID: MyAvatar.sessionUUID,
+            visible: false
+        });
+    }
+
+    _this.debugLightProperties = {
+        type: "Light",
+        name: "hifi-baton-light",
+        dimensions: {
+            x: 10,
+            y: 10,
+            z: 10
+        },
+        falloffRadius: 3,
+        intensity: 20,
+    }
+
+});

examples/entityScripts/virtualBaton/batonSimpleEntitySpawner.js

@@ -0,0 +1,33 @@
+  var orientation = Camera.getOrientation();
+  orientation = Quat.safeEulerAngles(orientation);
+  orientation.x = 0;
+  orientation = Quat.fromVec3Degrees(orientation);
+  var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(orientation)));
+
+  // Math.random ensures no caching of script
+  var SCRIPT_URL = Script.resolvePath("batonSimpleEntityScript.js");
+
+  var batonBox = Entities.addEntity({
+      type: "Box",
+      name: "hifi-baton-entity",
+      color: {
+          red: 200,
+          green: 200,
+          blue: 200
+      },
+      position: center,
+      dimensions: {
+          x: 0.1,
+          y: 0.1,
+          z: 0.1
+      },
+      script: SCRIPT_URL
+  });
+
+
+
+  function cleanup() {
+      Entities.deleteEntity(batonBox);
+  }
+
+  Script.scriptEnding.connect(cleanup);

examples/grab.js

@@ -373,6 +373,10 @@ Grabber.prototype.pressEvent = function(event) {
 
     beacon.updatePosition(this.startPosition);
 
+    if(!entityIsGrabbedByOther(this.entityID)){
+      this.moveEvent(event);
+    }
+     
     // TODO: play sounds again when we aren't leaking AudioInjector threads
     //Audio.playSound(grabSound, { position: entityProperties.position, volume: VOLUME });
 }

examples/html/entityProperties.html

@@ -151,7 +151,7 @@
                 data.properties[group][property] = {
                      x: elX.value,
                      y: elY.value,
-                     z: elZ.value,
+                     z: elZ ? elZ.value : 0,
                 };
                 EventBridge.emitWebEvent(JSON.stringify(data));
             }
@@ -451,6 +451,37 @@
 
                 var elPreviewCameraButton = document.getElementById("preview-camera-button");
     
+                var urlUpdaters = document.getElementsByClassName("update-url-version");
+                var PARAM_REGEXP = /(?:\?)(\S+)/; // Check if this has any parameters.
+                var TIMESTAMP_REGEXP = /(&?HFTime=\d+)/;
+
+                var refreshEvent = function(event){
+                    var urlElement = event.target.parentElement.getElementsByClassName("url")[0];
+                    var content = urlElement.value;
+                    var date = new Date();
+                    var timeStamp = date.getTime();
+
+                    if(content.length > 0){
+                        if(PARAM_REGEXP.test(content)){
+                        // Has params, so lets remove existing definition and append again.
+                            content = content.replace(TIMESTAMP_REGEXP,"") + "&";
+                        }else{
+                            content += "?";
+                        }
+                        content = content.replace("?&","?");
+                        urlElement.value = content + "HFTime=" + timeStamp;
+                    }
+
+                    var evt = document.createEvent("HTMLEvents");
+                    evt.initEvent("change", true, true );
+                    urlElement.dispatchEvent(evt);
+                };
+
+                for(var index = 0; index < urlUpdaters.length; index++){
+                    var urlUpdater = urlUpdaters[index];
+                    urlUpdater.addEventListener("click", refreshEvent);
+                }
+
                 if (window.EventBridge !== undefined) {
                     var properties;
                     EventBridge.scriptEventReceived.connect(function(data) {
@@ -683,7 +714,6 @@
                                     elZoneKeyLightAmbientIntensity.value = properties.keyLight.ambientIntensity.toFixed(2);
                                     elZoneKeyLightDirectionX.value = properties.keyLight.direction.x.toFixed(2);
                                     elZoneKeyLightDirectionY.value = properties.keyLight.direction.y.toFixed(2);
-                                    elZoneKeyLightDirectionZ.value = properties.keyLight.direction.z.toFixed(2);
                                     elZoneKeyLightAmbientURL.value = properties.keyLight.ambientURL;
     
     
@@ -937,12 +967,11 @@
                 elZoneKeyLightColorBlue.addEventListener('change', zoneKeyLightColorChangeFunction);
                 elZoneKeyLightIntensity.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('keyLight','intensity'));
                 elZoneKeyLightAmbientIntensity.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('keyLight','ambientIntensity'));
-                var zoneKeyLightDirectionChangeFunction = createEmitGroupVec3PropertyUpdateFunction('keyLight','direction', elZoneKeyLightDirectionX, elZoneKeyLightDirectionY, elZoneKeyLightDirectionZ);
+                elZoneKeyLightAmbientURL.addEventListener('change', createEmitGroupTextPropertyUpdateFunction('keyLight','ambientURL'));
+                var zoneKeyLightDirectionChangeFunction = createEmitGroupVec3PropertyUpdateFunction('keyLight','direction', elZoneKeyLightDirectionX, elZoneKeyLightDirectionY);
                 elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction);
                 elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
-                elZoneKeyLightDirectionZ.addEventListener('change', zoneKeyLightDirectionChangeFunction);
-                elZoneKeyLightAmbientURL.addEventListener('change', createEmitGroupTextPropertyUpdateFunction('keyLight','ambientURL'));
-    
+
                 elZoneStageLatitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage','latitude'));
                 elZoneStageLongitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage','longitude'));
                 elZoneStageAltitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage','altitude'));
@@ -1170,9 +1199,8 @@
         <div class="zone-section keyLight-section property">
             <div class="label">Light Direction</div>
             <div class="value">
-                <div class="input-area">Pitch <input class="coord" type="number" id="property-zone-key-light-direction-x"></div>
-                <div class="input-area">Yaw <input class="coord" type="number" id="property-zone-key-light-direction-y"></div>
-                <div class="input-area">Roll <input class="coord" type="number" id="property-zone-key-light-direction-z"></div>
+                <div class="input-area">Altitude <input class="coord" type="number" id="property-zone-key-light-direction-x"></div>
+                <div class="input-area">Azimuth <input class="coord" type="number" id="property-zone-key-light-direction-y"></div>
             </div>
         </div>
 
@@ -1188,6 +1216,7 @@
             <div class="label">Ambient URL</div>
             <div class="value">
                 <input type="text" id="property-zone-key-ambient-url" class="url">
+                <div class="update-url-version"></div>
             </div>
         </div>
 
@@ -1265,6 +1294,7 @@
             <div class="label">Skybox URL</div>
             <div class="value">
                 <input type="text" id="property-zone-skybox-url" class="url">
+                <div class="update-url-version"></div>
             </div>
         </div>
 
@@ -1276,6 +1306,7 @@
             <div class="label">Source URL</div>
             <div class="value">
                 <input type="text" id="property-web-source-url" class="url">
+                <div class="update-url-version"></div>
 
             </div>
         </div>
@@ -1289,12 +1320,14 @@
             <div class="label">Href - Hifi://address</div>
             <div class="value">
                 <input id="property-hyperlink-href" class="url">
+                <div class="update-url-version"></div>
             </div>
         </div>
         <div class="hyperlink-section property">
             <div class="label">Description</div>
             <div class="value">
                 <input id="property-hyperlink-description" class="url">
+                <div class="update-url-version"></div>
             </div>
         </div>
 
@@ -1378,16 +1411,19 @@
             <div class="label">X-axis Texture URL</div>
             <div class="value">
               <input type="text" id="property-x-texture-url" class="url">
+              <div class="update-url-version"></div>
             </div>
 
             <div class="label">Y-axis Texture URL</div>
             <div class="value">
               <input type="text" id="property-y-texture-url" class="url">
+              <div class="update-url-version"></div>
             </div>
 
             <div class="label">Z-axis Texture URL</div>
             <div class="value">
               <input type="text" id="property-z-texture-url" class="url">
+              <div class="update-url-version"></div>
             </div>
         </div>
 
@@ -1569,6 +1605,7 @@
             <div class="label">Collision Sound URL</div>
             <div class="value">
                 <input id="property-collision-sound-url" class="url">
+                <div class="update-url-version"></div>
             </div>
         </div>
 
@@ -1586,6 +1623,7 @@
             </div>
             <div class="value">
                 <input id="property-script-url" class="url">
+                <div class="update-url-version"></div>
             </div>
         </div>
 
@@ -1598,6 +1636,7 @@
             <div class="label">Model URL</div>
             <div class="value">
                 <input type="text" id="property-model-url" class="url">
+                <div class="update-url-version"></div>
             </div>
         </div>
 
@@ -1616,12 +1655,14 @@
             <div class="label">Compound Shape URL</div>
             <div class="value">
                 <input type="text" id="property-compound-shape-url" class="url">
+                <div class="update-url-version"></div>
             </div>
         </div>
         <div class="model-section property">
             <div class="label">Animation URL</div>
             <div class="value">
                 <input type="text" id="property-model-animation-url" class="url">
+                <div class="update-url-version"></div>
             </div>
         </div>
         <div class="model-section property">

examples/html/style.css

@@ -134,8 +134,18 @@ textarea {
     resize: vertical;
 }
 
+.update-url-version{
+    width:17px;
+    height:17px;
+    float:right;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAQAAACRZI9xAAABAUlEQVQoz33RvyvEARjH8SdlUX6UbhFJfgwmE3aTxWEiitxqN/gH7IxCKTcymLiJFIOJsihiUKcrCYnuXoZv+F45n2d4lvfz6fPpCSFs6BO1JllvLmXk5F37dC0vJ5NGmlBxoFp7Rn6RDpRRtG5KtynrijhLoBBGQcllKkFWAXsyCbKEFxeGqmJmFZFLkE639vX+12hCSVft0nUR8RbLcRN/aSHGIqL2tVYPconL32qLtaiL88Rl0qtXc+pTDv1OPGMlidtgS8Wp2RR05FEFM98/GlRQ9mTHvB7jVt2rKGPAT9xh2z6qfnToHV1SjZpN23Tl051di1oco9W/pdttaBRfEhFXOZV7vEsAAAAASUVORK5CYII=);
+    padding:0 !important;
+    margin:0 2px 0 0 !important;
+}
+
 input.url {
-    width: 100%;
+    width:85%;
+    padding-right: 20px;
 }
 
 input.coord {

examples/libraries/toolBars.js

@@ -110,12 +110,25 @@ Tool = function(properties, selectable, selected) { // selectable and selected a
     }
     
     this.select(selected);
-    
+
+    this.isButtonDown = false;
+    this.buttonDown = function (down) {
+        if (down !== this.isButtonDown) {
+            properties.subImage.y = (down ? 0 : 1) * properties.subImage.height;
+            Overlays.editOverlay(this.overlay(), { subImage: properties.subImage });
+            this.isButtonDown = down;
+        }
+    }
+
     this.baseClicked = this.clicked;
     this.clicked = function(clickedOverlay, update) {
         if (this.baseClicked(clickedOverlay)) {
-            if (selectable && update) {
-                this.toggle();
+            if (update) {
+                if (selectable) {
+                    this.toggle();
+                } else if (properties.showButtonDown) {
+                    this.buttonDown(true);
+                }
             }
             return true;
         }
@@ -131,7 +144,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
     this.x = x;
     this.y = y;
     this.width = 0;
-    this.height = ToolBar.TITLE_BAR_HEIGHT;
+    this.height = 0
     this.backAlpha = 1.0;
     this.back = Overlays.addOverlay("rectangle", {
                     color: { red: 255, green: 255, blue: 255 },
@@ -327,13 +340,13 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
     }
 
     var that = this;
-    this.contains = function (xOrPoint, optionalY) {
+    this.contains = function (xOrPoint, optionalY) {  // All four margins are draggable.
         var x = (optionalY === undefined) ? xOrPoint.x : xOrPoint,
             y = (optionalY === undefined) ? xOrPoint.y : optionalY;
-        return (that.x <= x) && (x <= (that.x + that.width)) &&
-            (that.y <= y) && (y <= (that.y + that.height));
+        return ((that.x - ToolBar.SPACING) <= x) && (x <= (that.x + that.width + ToolBar.SPACING)) &&
+            ((that.y - ToolBar.SPACING) <= y) && (y <= (that.y + that.height));
     }
-    that.hover = function (enable) { // Can be overriden or extended by clients.
+    that.hover = function (enable) {  // Can be overridden or extended by clients.
         that.isHovering = enable;
         if (that.back) {
             Overlays.editOverlay(this.back, {
@@ -376,6 +389,11 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
             that.mightBeDragging = false;
         }
     };
+    this.mouseReleaseEvent = function (event) {
+        for (var tool in that.tools) {
+            that.tools[tool].buttonDown(false);
+        }
+    }
     this.mouseMove  = function (event) {
         if (!that.mightBeDragging || !event.isLeftButton) {
             that.mightBeDragging = false;
@@ -399,6 +417,7 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
         }
     };
     Controller.mousePressEvent.connect(this.mousePressEvent);
+    Controller.mouseReleaseEvent.connect(this.mouseReleaseEvent);
     Controller.mouseMoveEvent.connect(this.mouseMove);
     Script.update.connect(that.checkResize);
     // This compatability hack breaks the model, but makes converting existing scripts easier:
@@ -431,7 +450,6 @@ ToolBar = function(x, y, direction, optionalPersistenceKey, optionalInitialPosit
         }
     }
 }
-ToolBar.SPACING = 4;
+ToolBar.SPACING = 6;
 ToolBar.VERTICAL = 0;
 ToolBar.HORIZONTAL = 1;
-ToolBar.TITLE_BAR_HEIGHT = 10;

examples/libraries/utils.js

@@ -28,7 +28,6 @@ colorMix = function(colorA, colorB, mix) {
     }
     return result;
 }
-
 scaleLine = function (start, end, scale) {
     var v = Vec3.subtract(end, start);
     var length = Vec3.length(v);
@@ -262,6 +261,16 @@ randInt = function(low, high) {
     return Math.floor(randFloat(low, high));
 }
 
+
+randomColor = function() {
+    return {
+                red: randInt(0, 255),
+                green: randInt(0, 255),
+                blue: randInt(0, 255)
+            }
+}
+
+
 hexToRgb = function(hex) {
     var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
     return result ? {

examples/marketplace.js

@@ -58,7 +58,6 @@ var toolBar = (function() {
         browseMarketplaceButton;
 
     function initialize() {
-        ToolBar.SPACING = 16;
         toolBar = new ToolBar(0, 0, ToolBar.VERTICAL, "highfidelity.marketplace.toolbar", function(windowDimensions, toolbar) {
             return {
                 x: windowDimensions.x - 8 - toolbar.width,
@@ -66,11 +65,18 @@ var toolBar = (function() {
             };
         });
         browseMarketplaceButton = toolBar.addTool({
-            imageURL: toolIconUrl + "marketplace.svg",
+            imageURL: toolIconUrl + "market-01.svg",
+            subImage: {
+                x: 0,
+                y: Tool.IMAGE_WIDTH,
+                width: Tool.IMAGE_WIDTH,
+                height: Tool.IMAGE_HEIGHT
+            },
             width: toolWidth,
             height: toolHeight,
             alpha: 0.9,
             visible: true,
+            showButtonDown: true
         });
 
         toolBar.showTool(browseMarketplaceButton, true);

examples/particle_explorer/particleExplorer.js

@@ -198,6 +198,16 @@ function createColorPicker(key) {
     settings[key] = colorArray;
     var controller = gui.addColor(settings, key);
     controller.onChange(function(value) {
+        // Handle hex colors
+        if(_.isString(value) && value[0] === '#') {
+            const BASE_HEX = 16;
+            var colorRegExResult = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(value);
+            value = [
+                parseInt(colorRegExResult[1], BASE_HEX),
+                parseInt(colorRegExResult[2], BASE_HEX),
+                parseInt(colorRegExResult[3], BASE_HEX)
+            ];
+        }
         var obj = {};
         obj[key] = convertColorArrayToObject(value);
         writeVec3ToInterface(obj);

examples/tests/basicEntityTest/entitySpawner.js

@@ -0,0 +1,31 @@
+  var orientation = Camera.getOrientation();
+  orientation = Quat.safeEulerAngles(orientation);
+  orientation.x = 0;
+  orientation = Quat.fromVec3Degrees(orientation);
+  var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(orientation)));
+
+  // Math.random ensures no caching of script
+  var SCRIPT_URL = Script.resolvePath("myEntityScript.js")
+
+  var myEntity = Entities.addEntity({
+      type: "Sphere",
+      color: {
+          red: 200,
+          green: 10,
+          blue: 200
+      },
+      position: center,
+      dimensions: {
+          x: 1,
+          y: 1,
+          z: 1
+      },
+      script: SCRIPT_URL
+  })
+
+
+  function cleanup() {
+      // Entities.deleteEntity(myEntity);
+  }
+
+  Script.scriptEnding.connect(cleanup);

examples/tests/basicEntityTest/myEntityScript.js

@@ -0,0 +1,24 @@
+
+(function() {
+    var _this;
+    MyEntity = function() {
+        _this = this;
+     
+    };
+
+    MyEntity.prototype = {
+
+
+        preload: function(entityID) {
+            this.entityID = entityID;
+            var randNum = Math.random().toFixed(3);
+            print("EBL PRELOAD ENTITY SCRIPT!!!", randNum)
+
+        },
+
+   
+    };
+
+    // entity scripts always need to return a newly constructed object of our type
+    return new MyEntity();
+});

examples/tests/batonSoundEntityTest/batonSoundTestEntityScript.js

@@ -0,0 +1,85 @@
+
+(function() {
+    Script.include("../../libraries/virtualBaton.js");
+
+    var baton;
+
+    var _this;
+    BatonSoundEntity = function() {
+        _this = this;
+        _this.drumSound = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/Drums/deepdrum1.wav");
+        _this.injectorOptions = {position: MyAvatar.position, loop: false, volume: 1};
+        _this.soundIntervalConnected = false;
+        _this.batonDebugModel = Entities.addEntity({
+            type: "Box",
+            color: {red: 200, green: 10, blue: 200},
+            position: Vec3.sum(MyAvatar.position, {x: 0, y: 1, z: 0}),
+            dimensions: {x: 0.5, y: 1, z: 0},
+            parentID: MyAvatar.sessionUUID,
+            visible: false
+        });
+    };
+
+    function startUpdate() {
+        // We are claiming the baton! So start our clip
+        if (!_this.soundInjector) {
+            // This client hasn't created their injector yet so create one
+           _this.soundInjector = Audio.playSound(_this.drumSound, _this.injectorOptions);
+        } else {
+            // We already have our injector so just restart it
+            _this.soundInjector.restart();
+        }
+        print("EBL START UPDATE");
+        Entities.editEntity(_this.batonDebugModel, {visible: true});
+        _this.playSoundInterval = Script.setInterval(function() {
+            _this.soundInjector.restart();
+        }, _this.drumSound.duration * 1000); // Duration is in seconds so convert to ms
+        _this.soundIntervalConnected = true;
+    }
+
+    function stopUpdateAndReclaim() {
+        print("EBL STOP UPDATE AND RECLAIM")
+        // when the baton is release
+        if (_this.soundIntervalConnected === true) {
+            Script.clearInterval(_this.playSoundInterval);
+            _this.soundIntervalConnected = false;
+            print("EBL CLEAR INTERVAL")
+        }
+        Entities.editEntity(_this.batonDebugModel, {visible: false});
+        // hook up callbacks to the baton
+        baton.claim(startUpdate, stopUpdateAndReclaim);
+    }
+
+    BatonSoundEntity.prototype = {
+
+
+        preload: function(entityID) {
+            _this.entityID = entityID;
+            print("EBL PRELOAD ENTITY SCRIPT!!!");
+            baton = virtualBaton({
+                // One winner for each entity
+                batonName: "io.highfidelity.soundEntityBatonTest:" + _this.entityID,
+                // debugFlow: true
+            });
+            stopUpdateAndReclaim();
+        },
+
+        unload: function() {
+            print("EBL UNLOAD");
+            // baton.release();
+            baton.unload();
+            Entities.deleteEntity(_this.batonDebugModel);
+            if (_this.soundIntervalConnected === true) {
+                Script.clearInterval(_this.playSoundInterval);
+                _this.soundIntervalConnected = false;
+                _this.soundInjector.stop();
+                delete _this.soundInjector;
+            }
+        }
+
+   
+    };
+
+    // entity scripts always need to return a newly constructed object of our type
+    return new BatonSoundEntity();
+});

examples/tests/batonSoundEntityTest/batonSoundTestEntitySpawner.js

@@ -0,0 +1,31 @@
+  var orientation = Camera.getOrientation();
+  orientation = Quat.safeEulerAngles(orientation);
+  orientation.x = 0;
+  orientation = Quat.fromVec3Degrees(orientation);
+  var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(orientation)));
+
+  // Math.random ensures no caching of script
+  var SCRIPT_URL = Script.resolvePath("batonSoundTestEntityScript.js")
+
+  var soundEntity = Entities.addEntity({
+      type: "Box",
+      color: {
+          red: 200,
+          green: 10,
+          blue: 10
+      },
+      position: center,
+      dimensions: {
+          x: 0.1,
+          y: 0.1,
+          z: 0.1
+      },
+      script: SCRIPT_URL
+  });
+
+
+  function cleanup() {
+      // Entities.deleteEntity(soundEntity);
+  }
+
+  Script.scriptEnding.connect(cleanup);

examples/utilities/tools/render/BG.qml

@@ -0,0 +1,22 @@
+//
+//  BG.qml
+//  examples/utilities/tools/render
+//
+//  Created by Zach Pomerantz on 2/8/2016
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html
+//
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+
+Item {
+    Timer {
+        running: true; repeat: true
+        onTriggered: time.text = Render.getConfig("DrawBackgroundDeferred").gpuTime
+    }
+
+    Text { id: time; font.pointSize: 20 }
+}
+

examples/utilities/tools/render/debugBG.js

@@ -0,0 +1,21 @@
+//
+//  debugBG.js
+//  examples/utilities/tools/render
+//
+//  Zach Pomerantz, created on 1/27/2016.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+// Set up the qml ui
+var qml = Script.resolvePath('BG.qml');
+var window = new OverlayWindow({
+    title: 'Background Timer',
+    source: qml,
+    width: 300
+});
+window.setPosition(25, 50);
+window.closed.connect(function() { Script.stop(); });
+

examples/voxels.js

@@ -16,8 +16,8 @@ var deletingVoxels = false;
 var addingSpheres = false;
 var deletingSpheres = false;
 
-var offAlpha = 0.5;
-var onAlpha = 0.9;
+var offAlpha = 0.8;
+var onAlpha = 1.0;
 var editSphereRadius = 4;
 
 function floorVector(v) {
@@ -48,52 +48,47 @@ var toolBar = (function () {
             height: toolHeight,
             alpha: onAlpha,
             visible: true,
-        });
+        }, false);
 
         addVoxelButton = toolBar.addTool({
             imageURL: toolIconUrl + "voxel-add.svg",
-            subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
             width: toolWidth,
             height: toolHeight,
             alpha: offAlpha,
             visible: false
-        });
+        }, false);
 
         deleteVoxelButton = toolBar.addTool({
             imageURL: toolIconUrl + "voxel-delete.svg",
-            subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
             width: toolWidth,
             height: toolHeight,
             alpha: offAlpha,
             visible: false
-        });
+        }, false);
 
         addSphereButton = toolBar.addTool({
             imageURL: toolIconUrl + "sphere-add.svg",
-            subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
             width: toolWidth,
             height: toolHeight,
             alpha: offAlpha,
             visible: false
-        });
+        }, false);
 
         deleteSphereButton = toolBar.addTool({
             imageURL: toolIconUrl + "sphere-delete.svg",
-            subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
             width: toolWidth,
             height: toolHeight,
             alpha: offAlpha,
             visible: false
-        });
+        }, false);
 
         addTerrainButton = toolBar.addTool({
             imageURL: toolIconUrl + "voxel-terrain.svg",
-            subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
             width: toolWidth,
             height: toolHeight,
             alpha: onAlpha,
             visible: false
-        });
+        }, false);
 
         that.setActive(false);
     }
@@ -193,7 +188,6 @@ var toolBar = (function () {
 
     that.cleanup = function () {
         toolBar.cleanup();
-        // Overlays.deleteOverlay(activeButton);
     };
 
 
@@ -237,7 +231,6 @@ function grabLowestJointY() {
 }
 
 
-
 function addTerrainBlock() {
     var baseLocation = getTerrainAlignedLocation(Vec3.sum(MyAvatar.position, {x:8, y:8, z:8}));
     if (baseLocation.y > MyAvatar.position.y) {
@@ -253,10 +246,26 @@ function addTerrainBlock() {
         baseLocation = getTerrainAlignedLocation(facingPosition);
         alreadyThere = lookupTerrainForLocation(baseLocation);
         if (alreadyThere) {
-            return;
+            return null;
         }
     }
 
+    var polyVoxID = addTerrainBlockNearLocation(baseLocation);
+
+    if (polyVoxID) {
+        var AvatarPositionInVoxelCoords = Entities.worldCoordsToVoxelCoords(polyVoxID, MyAvatar.position);
+        // TODO -- how to find the avatar's feet?
+        var topY = Math.round(AvatarPositionInVoxelCoords.y) - 4;
+        Entities.setVoxelsInCuboid(polyVoxID, {x:0, y:0, z:0}, {x:16, y:topY, z:16}, 255);
+    }
+}
+
+function addTerrainBlockNearLocation(baseLocation) {
+    var alreadyThere = lookupTerrainForLocation(baseLocation);
+    if (alreadyThere) {
+        return null;
+    }
+
     var polyVoxID = Entities.addEntity({
         type: "PolyVox",
         name: "terrain",
@@ -269,12 +278,6 @@ function addTerrainBlock() {
         zTextureURL: "http://headache.hungry.com/~seth/hifi/dirt.jpeg"
     });
 
-    var AvatarPositionInVoxelCoords = Entities.worldCoordsToVoxelCoords(polyVoxID, MyAvatar.position);
-    // TODO -- how to find the avatar's feet?
-    var topY = Math.round(AvatarPositionInVoxelCoords.y) - 4;
-    Entities.setVoxelsInCuboid(polyVoxID, {x:0, y:0, z:0}, {x:16, y:topY, z:16}, 255);
-
-
     //////////
     // stitch together the terrain with x/y/z NeighorID properties
     //////////
@@ -330,7 +333,7 @@ function addTerrainBlock() {
     properties.zPNeighborID = lookupTerrainForLocation(Vec3.sum(baseLocation, {x:0, y:0, z:16}));
     Entities.editEntity(polyVoxID, properties);
 
-    return true;
+    return polyVoxID;
 }
 
 
@@ -456,9 +459,6 @@ function keyReleaseEvent(event) {
 
 
 function cleanup() {
-    for (var i = 0; i < overlays.length; i++) {
-        Overlays.deleteOverlay(overlays[i]);
-    }
     toolBar.cleanup();
 }
 

interface/resources/qml/AssetServer.qml

@@ -0,0 +1,520 @@
+//
+//  AssetServer.qml
+//
+//  Created by Clement on  3/1/16
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import QtQuick.Dialogs 1.2 as OriginalDialogs
+import Qt.labs.settings 1.0
+
+import "styles-uit"
+import "controls-uit" as HifiControls
+import "windows-uit"
+import "dialogs"
+
+Window {
+    id: root
+    objectName: "AssetServer"
+    title: "My Asset Server"
+    resizable: true
+    destroyOnInvisible: true
+    x: 40; y: 40
+    implicitWidth: 384; implicitHeight: 640
+    minSize: Qt.vector2d(200, 300)
+
+    property int colorScheme: hifi.colorSchemes.dark
+
+    HifiConstants { id: hifi }
+
+    property var scripts: ScriptDiscoveryService;
+    property var assetProxyModel: Assets.proxyModel;
+    property var assetMappingsModel: Assets.mappingModel;
+    property var currentDirectory;
+
+    Settings {
+        category: "Overlay.AssetServer"
+        property alias x: root.x
+        property alias y: root.y
+        property alias directory: root.currentDirectory
+    }
+
+    Component.onCompleted: {
+        ApplicationInterface.uploadRequest.connect(uploadClicked);
+        assetMappingsModel.errorGettingMappings.connect(handleGetMappingsError);
+        reload();
+    }
+
+    function doDeleteFile(path) {
+        console.log("Deleting " + path);
+
+        Assets.deleteMappings(path, function(err) {
+            if (err) {
+                console.log("Asset browser - error deleting path: ", path, err);
+
+                box = errorMessageBox("There was an error deleting:\n" + path + "\n" + err);
+                box.selected.connect(reload);
+            } else {
+                console.log("Asset browser - finished deleting path: ", path);
+                reload();
+            }
+        });
+
+    }
+
+    function doRenameFile(oldPath, newPath) {
+
+        if (newPath[0] != "/") {
+            newPath = "/" + newPath;
+        }
+
+        if (oldPath[oldPath.length - 1] == '/' && newPath[newPath.length - 1] != '/') {
+            // this is a folder rename but the user neglected to add a trailing slash when providing a new path
+            newPath = newPath + "/";
+        }
+
+        if (Assets.isKnownFolder(newPath)) {
+            box = errorMessageBox("Cannot overwrite existing directory.");
+            box.selected.connect(reload);
+        }
+
+        console.log("Asset browser - renaming " + oldPath + " to " + newPath);
+
+        Assets.renameMapping(oldPath, newPath, function(err) {
+            if (err) {
+                console.log("Asset browser - error renaming: ", oldPath, "=>", newPath, " - error ", err);
+                box = errorMessageBox("There was an error renaming:\n" + oldPath + " to " + newPath + "\n" + err);
+                box.selected.connect(reload);
+            } else {
+                console.log("Asset browser - finished rename: ", oldPath, "=>", newPath);
+            }
+
+            reload();
+        });
+    }
+
+    function fileExists(path) {
+        return Assets.isKnownMapping(path);
+    }
+
+    function askForOverwrite(path, callback) {
+        var object = desktop.messageBox({
+            icon: hifi.icons.question,
+            buttons: OriginalDialogs.StandardButton.Yes | OriginalDialogs.StandardButton.No,
+            defaultButton: OriginalDialogs.StandardButton.No,
+            title: "Overwrite File",
+            text: path + "\n" + "This file already exists. Do you want to overwrite it?"
+        });
+        object.selected.connect(function(button) {
+            if (button === OriginalDialogs.StandardButton.Yes) {
+                callback();
+            }
+        });
+    }
+
+    function canAddToWorld(path) {
+        var supportedExtensions = [/\.fbx\b/i, /\.obj\b/i];
+
+        return supportedExtensions.reduce(function(total, current) {
+            return total | new RegExp(current).test(path);
+        }, false);
+    }
+
+    function reload() {
+        Assets.mappingModel.refresh();
+        treeView.selection.clear();
+    }
+
+    function handleGetMappingsError(errorString) {
+        errorMessageBox(
+            "There was a problem retreiving the list of assets from your Asset Server.\n"
+            + errorString
+        );
+    }
+
+    function addToWorld() {
+        var url = assetProxyModel.data(treeView.selection.currentIndex, 0x103);
+
+        if (!url || !canAddToWorld(url)) {
+            return;
+        }
+
+        var name = assetProxyModel.data(treeView.selection.currentIndex);
+
+        console.log("Asset browser - adding asset " + url + " (" + name + ") to world.");
+
+        var addPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getFront(MyAvatar.orientation)));
+        Entities.addModelEntity(name, url, addPosition);
+    }
+
+    function copyURLToClipboard(index) {
+        if (!index) {
+            index = treeView.selection.currentIndex;
+        }
+
+        var url = assetProxyModel.data(treeView.selection.currentIndex, 0x103);
+        if (!url) {
+            return;
+        }
+        Window.copyToClipboard(url);
+    }
+
+    function renameEl(index, data) {
+        if (!index) {
+            return false;
+        }
+
+        var path = assetProxyModel.data(index, 0x100);
+        if (!path) {
+            return false;
+        }
+
+        var destinationPath = path.split('/');
+        destinationPath[destinationPath.length - (path[path.length - 1] === '/' ? 2 : 1)] = data;
+        destinationPath = destinationPath.join('/').trim();
+
+        if (path === destinationPath) {
+            return;
+        }
+        if (!fileExists(destinationPath)) {
+            doRenameFile(path, destinationPath);
+        }
+    }
+    function renameFile(index) {
+        if (!index) {
+            index = treeView.selection.currentIndex;
+        }
+
+        var path = assetProxyModel.data(index, 0x100);
+        if (!path) {
+            return;
+        }
+
+        var object = desktop.inputDialog({
+            label: "Enter new path:",
+            current: path,
+            placeholderText: "Enter path here"
+        });
+        object.selected.connect(function(destinationPath) {
+            destinationPath = destinationPath.trim();
+
+            if (path == destinationPath) {
+                return;
+            }
+            if (fileExists(destinationPath)) {
+                askForOverwrite(destinationPath, function() {
+                    doRenameFile(path, destinationPath);
+                });
+            } else {
+                doRenameFile(path, destinationPath);
+            }
+        });
+    }
+    function deleteFile(index) {
+        if (!index) {
+            index = treeView.selection.currentIndex;
+        }
+        var path = assetProxyModel.data(index, 0x100);
+        if (!path) {
+            return;
+        }
+
+        var isFolder = assetProxyModel.data(treeView.selection.currentIndex, 0x101);
+        var typeString = isFolder ? 'folder' : 'file';
+
+        var object = desktop.messageBox({
+            icon: hifi.icons.question,
+            buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
+            defaultButton: OriginalDialogs.StandardButton.Yes,
+            title: "Delete",
+            text: "You are about to delete the following " + typeString + ":\n" + path + "\nDo you want to continue?"
+        });
+        object.selected.connect(function(button) {
+            if (button === OriginalDialogs.StandardButton.Yes) {
+                doDeleteFile(path);
+            }
+        });
+    }
+
+
+    property var uploadOpen: false;
+    Timer {
+        id: timer
+    }
+    function uploadClicked(fileUrl) {
+        if (uploadOpen) {
+            return;
+        }
+        uploadOpen = true;
+
+        function doUpload(url, dropping) {
+            var fileUrl = fileDialogHelper.urlToPath(url);
+
+            var path = assetProxyModel.data(treeView.selection.currentIndex, 0x100);
+            var directory = path ? path.slice(0, path.lastIndexOf('/') + 1) : "/";
+            var filename = fileUrl.slice(fileUrl.lastIndexOf('/') + 1);
+
+            Assets.uploadFile(fileUrl, directory + filename,
+                function() {
+                    // Upload started
+                    uploadSpinner.visible = true;
+                    uploadButton.enabled = false;
+                    uploadProgressLabel.text = "In progress...";
+                },
+                function(err, path) {
+                    print(err, path);
+                    if (!err) {
+                        uploadProgressLabel.text = "Upload Complete";
+                        timer.interval = 1000;
+                        timer.repeat = false;
+                        timer.triggered.connect(function() {
+                            uploadSpinner.visible = false;
+                            uploadButton.enabled = true;
+                            uploadOpen = false;
+                        });
+                        timer.start();
+                        console.log("Asset Browser - finished uploading: ", fileUrl);
+                        reload();
+                    } else {
+                        if (err > 0) {
+                            console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err);
+                            var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + Assets.getErrorString(err));
+                            box.selected.connect(reload);
+                        }
+                        uploadSpinner.visible = false;
+                        uploadButton.enabled = true;
+                        uploadOpen = false;
+                    }
+            }, dropping);
+        }
+
+        if (fileUrl) {
+            doUpload(fileUrl, true);
+        } else {
+            var browser = desktop.fileDialog({
+                selectDirectory: false,
+                dir: currentDirectory
+            });
+            browser.canceled.connect(function() {
+                uploadOpen = false;
+            });
+            browser.selectedFile.connect(function(url) {
+                currentDirectory = browser.dir;
+                doUpload(url, false);
+            });
+        }
+    }
+
+    function errorMessageBox(message) {
+        return desktop.messageBox({
+            icon: hifi.icons.warning,
+            defaultButton: OriginalDialogs.StandardButton.Ok,
+            title: "Error",
+            text: message
+        });
+    }
+
+    Item {
+        width: pane.contentWidth
+        height: pane.height
+
+        HifiControls.ContentSection {
+            id: assetDirectory
+            name: "Asset Directory"
+            spacing: hifi.dimensions.contentSpacing.y
+            isFirst: true
+
+            Row {
+                id: buttonRow
+                anchors.left: parent.left
+                anchors.right: parent.right
+                spacing: hifi.dimensions.contentSpacing.x
+
+                HifiControls.GlyphButton {
+                    glyph: hifi.glyphs.reload
+                    color: hifi.buttons.white
+                    colorScheme: root.colorScheme
+                    height: 26
+                    width: 26
+
+                    onClicked: root.reload()
+                }
+
+                HifiControls.Button {
+                    text: "ADD TO WORLD"
+                    color: hifi.buttons.white
+                    colorScheme: root.colorScheme
+                    height: 26
+                    width: 120
+
+                    enabled: canAddToWorld(assetProxyModel.data(treeView.selection.currentIndex, 0x100))
+
+                    onClicked: root.addToWorld()
+                }
+
+                HifiControls.Button {
+                    text: "RENAME"
+                    color: hifi.buttons.white
+                    colorScheme: root.colorScheme
+                    height: 26
+                    width: 80
+
+                    onClicked: root.renameFile()
+                    enabled: treeView.selection.hasSelection
+                }
+
+                HifiControls.Button {
+                    id: deleteButton
+
+                    text: "DELETE"
+                    color: hifi.buttons.red
+                    colorScheme: root.colorScheme
+                    height: 26
+                    width: 80
+
+                    onClicked: root.deleteFile()
+                    enabled: treeView.selection.hasSelection
+                }
+            }
+
+            Menu {
+                id: contextMenu
+                title: "Edit"
+                property var url: ""
+                property var currentIndex: null
+
+                MenuItem {
+                    text: "Copy URL"
+                    onTriggered: {
+                        copyURLToClipboard(contextMenu.currentIndex);
+                    }
+                }
+
+                MenuItem {
+                    text: "Rename"
+                    onTriggered: {
+                        renameFile(contextMenu.currentIndex);
+                    }
+                }
+
+                MenuItem {
+                    text: "Delete"
+                    onTriggered: {
+                        deleteFile(contextMenu.currentIndex);
+                    }
+                }
+            }
+        }
+
+        HifiControls.Tree {
+            id: treeView
+            anchors.top: assetDirectory.bottom
+            anchors.bottom: uploadSection.top
+            anchors.margins: 12
+            anchors.bottomMargin: 0
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            treeModel: assetProxyModel
+            canEdit: true
+            colorScheme: root.colorScheme
+
+            modifyEl: renameEl
+
+            MouseArea {
+                propagateComposedEvents: true
+                anchors.fill: parent
+                acceptedButtons: Qt.RightButton
+                onClicked: {
+                    var index = treeView.indexAt(mouse.x, mouse.y);
+
+                    treeView.selection.setCurrentIndex(index, 0x0002);
+
+                    contextMenu.currentIndex = index;
+                    contextMenu.popup();
+                }
+            }
+        }
+        HifiControls.ContentSection {
+            id: uploadSection
+            name: "Upload A File"
+            spacing: hifi.dimensions.contentSpacing.y
+            anchors.bottom: parent.bottom
+            height: 130
+
+            Item {
+                height: parent.height
+                width: parent.width
+                HifiControls.Button {
+                    id: uploadButton
+                    anchors.right: parent.right
+
+                    text: "Choose File"
+                    color: hifi.buttons.blue
+                    colorScheme: root.colorScheme
+                    height: 30
+                    width: 155
+
+                    onClicked: uploadClickedTimer.running = true
+
+                    // For some reason trigginer an API that enters
+                    // an internal event loop directly from the button clicked
+                    // trigger below causes the appliction to behave oddly.
+                    // Most likely because the button onClicked handling is never
+                    // completed until the function returns.
+                    // FIXME find a better way of handling the input dialogs that
+                    // doesn't trigger this.
+                    Timer {
+                        id: uploadClickedTimer
+                        interval: 5
+                        repeat: false
+                        running: false
+                        onTriggered: uploadClicked();
+                    }
+                }
+
+                Item {
+                    id: uploadSpinner
+                    visible: false
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    width: 40
+                    height: 32
+
+                    Image {
+                        id: image
+                        width: 24
+                        height: 24
+                        source: "../images/Loading-Outer-Ring.png"
+                        RotationAnimation on rotation {
+                            loops: Animation.Infinite
+                            from: 0
+                            to: 360
+                            duration: 2000
+                        }
+                    }
+                    Image {
+                        width: 24
+                        height: 24
+                        source: "../images/Loading-Inner-H.png"
+                    }
+                    HifiControls.Label {
+                        id: uploadProgressLabel
+                        anchors.left: image.right
+                        anchors.leftMargin: 10
+                        anchors.verticalCenter: image.verticalCenter
+                        text: "In progress..."
+                        colorScheme: root.colorScheme
+                    }
+
+                }
+            }
+
+        }
+    }
+}

interface/resources/qml/Stats.qml

@@ -169,6 +169,28 @@ Item {
                         text: "Downloads: " + root.downloads + "/" + root.downloadLimit +
                               ", Pending: " + root.downloadsPending;
                     }
+                    Text {
+                        color: root.fontColor;
+                        font.pixelSize: root.fontSize
+                        visible: root.expanded && root.downloadUrls.length > 0;
+                        text: "Download URLs:"
+                    }
+                    ListView {
+                        width: geoCol.width
+                        height: root.downloadUrls.length * 15
+
+                        visible: root.expanded && root.downloadUrls.length > 0;
+
+                        model: root.downloadUrls
+                        delegate: Text {
+                            color: root.fontColor;
+                            font.pixelSize: root.fontSize
+                            visible: root.expanded;
+                            text: modelData.length > 30
+                                ?  modelData.substring(0, 5) + "..." + modelData.substring(modelData.length - 22)
+                                : modelData
+                        }
+                    }
                 }
             }
             Rectangle {

interface/resources/qml/ToolWindow.qml

@@ -17,7 +17,6 @@ Windows.Window {
     visible: false
     width: 384; height: 640;
     title: "Tools"
-    property string newTabSource
     property alias tabView: tabView
     onParentChanged: {
         if (parent) {
@@ -32,26 +31,21 @@ Windows.Window {
         property alias y: toolWindow.y
     }
 
-    property var webTabCreator: Component {
-        Controls.WebView {
-            id: webView
-            property string originalUrl;
-
-            // Both toolWindow.newTabSource and url can change, so we need
-            // to store the original url here, without creating any bindings
-            Component.onCompleted: {
-                originalUrl = toolWindow.newTabSource;
-                url = originalUrl;
-            }
-        }
-    }
-
     TabView {
         anchors.fill: parent
         id: tabView;
-        onCountChanged: {
-            if (0 == count) {
-                toolWindow.visible = false
+        Repeater {
+            model: 4
+            Tab {
+                active: true
+                enabled: false;
+                // we need to store the original url here for future identification
+                property string originalUrl: "";
+                onEnabledChanged: toolWindow.updateVisiblity();
+                Controls.WebView {
+                    id: webView;
+                    anchors.fill: parent
+                }
             }
         }
     }
@@ -68,8 +62,7 @@ Windows.Window {
     function findIndexForUrl(source) {
         for (var i = 0; i < tabView.count; ++i) {
             var tab = tabView.getTab(i);
-            if (tab && tab.item && tab.item.originalUrl &&
-                tab.item.originalUrl === source) {
+            if (tab.originalUrl === source) {
                 return i;
             }
         }
@@ -101,21 +94,32 @@ Windows.Window {
         }
     }
 
+    function findFreeTab() {
+        for (var i = 0; i < tabView.count; ++i) {
+            var tab = tabView.getTab(i);
+            if (tab && (!tab.originalUrl || tab.originalUrl === "")) {
+                return i;
+            }
+        }
+        console.warn("Could not find free tab");
+        return -1;
+    }
+
     function removeTabForUrl(source) {
         var index = findIndexForUrl(source);
         if (index < 0) {
             return;
         }
+
         var tab = tabView.getTab(index);
-        tab.enabledChanged.disconnect(updateVisiblity);
-        tabView.removeTab(index);
-        console.log("Updating visibility based on child tab removed");
-        updateVisiblity();
+        tab.title = "";
+        tab.originalUrl = "";
+        tab.enabled = false;
     }
 
     function addWebTab(properties) {
         if (!properties.source) {
-            console.warn("Attempted to open Web Tool Pane without URl")
+            console.warn("Attempted to open Web Tool Pane without URL")
             return;
         }
 
@@ -125,11 +129,17 @@ Windows.Window {
             return tabView.getTab(existingTabIndex);
         }
 
-        var title = properties.title || "Unknown";
-        newTabSource = properties.source;
-        var newTab = tabView.addTab(title, webTabCreator);
+        var freeTabIndex = findFreeTab();
+        if (freeTabIndex === -1) {
+            console.warn("Unable to add new tab");
+            return;
+        }
+
+        var newTab = tabView.getTab(freeTabIndex);
+        newTab.title = properties.title || "Unknown";
+        newTab.originalUrl = properties.source;
+        newTab.item.url = properties.source;
         newTab.active = true;
-        newTab.enabled = false;
 
         if (properties.width) {
             tabView.width = Math.min(Math.max(tabView.width, properties.width),

interface/resources/qml/controls-uit/AttachmentsTable.qml

@@ -0,0 +1,171 @@
+//
+//  AttachmentsTable.qml
+//
+//  Created by David Rowe on 18 Feb 2016
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
+import QtQuick.XmlListModel 2.0
+
+import "../styles-uit"
+import "../controls-uit" as HifiControls
+import "../windows-uit"
+import "../hifi/models"
+
+TableView {
+    id: tableView
+
+    //    property var tableModel: ListModel { }
+    property int colorScheme: hifi.colorSchemes.light
+    readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
+
+    model: S3Model{}
+
+    Rectangle {
+        anchors.fill: parent
+        visible: tableView.model.status !== XmlListModel.Ready
+        color: hifi.colors.darkGray0
+        BusyIndicator {
+            anchors.centerIn: parent
+            width: 48; height: 48
+            running: true
+        }
+    }
+
+    headerDelegate: Rectangle {
+        height: hifi.dimensions.tableHeaderHeight
+        color: hifi.colors.darkGray
+        border.width: 0.5
+        border.color: hifi.colors.baseGrayHighlight
+
+        RalewayRegular {
+            id: textHeader
+            size: hifi.fontSizes.tableText
+            color: hifi.colors.lightGrayText
+            text: styleData.value
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                verticalCenter: parent.verticalCenter
+            }
+        }
+    }
+
+    // Use rectangle to draw border with rounded corners.
+    Rectangle {
+        color: "#00000000"
+        anchors { fill: parent; margins: -2 }
+        radius: hifi.dimensions.borderRadius
+        border.color: hifi.colors.baseGrayHighlight
+        border.width: 3
+    }
+    anchors.margins: 2  // Shrink TableView to lie within border.
+    backgroundVisible: true
+
+    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
+    verticalScrollBarPolicy: Qt.ScrollBarAsNeeded
+
+    style: TableViewStyle {
+        // Needed in order for rows to keep displaying rows after end of table entries.
+        backgroundColor: parent.isLightColorScheme ? hifi.colors.tableRowLightEven : hifi.colors.tableRowDarkEven
+        alternateBackgroundColor: parent.isLightColorScheme ? hifi.colors.tableRowLightOdd : hifi.colors.tableRowDarkOdd
+
+        handle: Item {
+            id: scrollbarHandle
+            implicitWidth: 6
+            Rectangle {
+                anchors {
+                    fill: parent
+                    leftMargin: 2       // Move it right
+                    rightMargin: -2     // ""
+                    topMargin: 3        // Shrink vertically
+                    bottomMargin: 3     // ""
+                }
+                radius: 3
+                color: hifi.colors.tableScrollHandle
+            }
+        }
+
+        scrollBarBackground: Item {
+            implicitWidth: 10
+            Rectangle {
+                anchors {
+                    fill: parent
+                    margins: -1     // Expand
+                }
+                color: hifi.colors.baseGrayHighlight
+            }
+
+            Rectangle {
+                anchors {
+                    fill: parent
+                    margins: 1      // Shrink
+                }
+                radius: 4
+                color: hifi.colors.tableScrollBackground
+            }
+        }
+
+        incrementControl: Item {
+            visible: false
+        }
+
+        decrementControl: Item {
+            visible: false
+        }
+    }
+
+    rowDelegate: Rectangle {
+        height: (styleData.selected ? 1.2 : 1) * hifi.dimensions.tableRowHeight
+        color: styleData.selected
+               ? hifi.colors.primaryHighlight
+               : tableView.isLightColorScheme
+                 ? (styleData.alternate ? hifi.colors.tableRowLightEven : hifi.colors.tableRowLightOdd)
+                 : (styleData.alternate ? hifi.colors.tableRowDarkEven : hifi.colors.tableRowDarkOdd)
+    }
+
+    itemDelegate: Item {
+        anchors {
+            left: parent ? parent.left : undefined
+            leftMargin: hifi.dimensions.tablePadding
+            right: parent ? parent.right : undefined
+            rightMargin: hifi.dimensions.tablePadding
+        }
+        FiraSansSemiBold {
+            id: textItem
+            text: styleData.value
+            size: hifi.fontSizes.tableText
+            color: colorScheme == hifi.colorSchemes.light
+                   ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
+                   : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                verticalCenter: parent.verticalCenter
+            }
+        }
+    }
+
+    TableViewColumn {
+        role: "name"
+        title: "NAME"
+        width: parent.width *0.3
+        horizontalAlignment: Text.AlignHCenter
+    }
+    TableViewColumn {
+        role: "size"
+        title: "SIZE"
+        width: parent.width *0.2
+        horizontalAlignment: Text.AlignHCenter
+    }
+    TableViewColumn {
+        role: "modified"
+        title: "LAST MODIFIED"
+        width: parent.width *0.5
+        horizontalAlignment: Text.AlignHCenter
+    }
+}

interface/resources/qml/controls-uit/Button.qml

@@ -15,8 +15,9 @@ import QtQuick.Controls.Styles 1.4
 import "../styles-uit"
 
 Original.Button {
-    id: button
     property int color: 0
+    property int colorScheme: hifi.colorSchemes.light
+
     width: 120
     height: 28
 
@@ -24,27 +25,43 @@ Original.Button {
 
         background: Rectangle {
             radius: hifi.buttons.radius
+
             gradient: Gradient {
                 GradientStop {
                     position: 0.2
-                    color: enabled
-                           ? (!pressed && button.color != hifi.buttons.black || (!hovered || pressed) && button.color == hifi.buttons.black
-                              ? hifi.buttons.colorStart[button.color] : hifi.buttons.colorFinish[button.color])
-                           : hifi.buttons.colorStart[hifi.buttons.white]
+                    color: {
+                        if (!control.enabled) {
+                            hifi.buttons.disabledColorStart[control.colorScheme]
+                        } else if (control.pressed) {
+                            hifi.buttons.pressedColor[control.color]
+                        } else if (control.hovered) {
+                            hifi.buttons.hoveredColor[control.color]
+                        } else {
+                            hifi.buttons.colorStart[control.color]
+                        }
+                    }
                 }
                 GradientStop {
                     position: 1.0
-                    color: enabled
-                           ? ((!hovered || pressed) && button.color != hifi.buttons.black || !pressed && button.color == hifi.buttons.black
-                              ? hifi.buttons.colorFinish[button.color] : hifi.buttons.colorStart[button.color])
-                           : hifi.buttons.colorFinish[hifi.buttons.white]
+                    color: {
+                        if (!control.enabled) {
+                            hifi.buttons.disabledColorFinish[control.colorScheme]
+                        } else if (control.pressed) {
+                            hifi.buttons.pressedColor[control.color]
+                        } else if (control.hovered) {
+                            hifi.buttons.hoveredColor[control.color]
+                        } else {
+                            hifi.buttons.colorFinish[control.color]
+                        }
+                    }
                 }
             }
         }
 
         label: RalewayBold {
             font.capitalization: Font.AllUppercase
-            color: enabled ? hifi.buttons.textColor[button.color] : hifi.colors.lightGrayText
+            color: enabled ? hifi.buttons.textColor[control.color]
+                           : hifi.buttons.disabledTextColor[control.colorScheme]
             size: hifi.fontSizes.buttonLabel
             verticalAlignment: Text.AlignVCenter
             horizontalAlignment: Text.AlignHCenter

interface/resources/qml/controls-uit/ComboBox.qml

@@ -162,6 +162,30 @@ FocusScope {
             height: 480
             width: root.width + 4
 
+            style: ScrollViewStyle {
+                decrementControl: Item {
+                    visible: false
+                }
+                incrementControl: Item {
+                    visible: false
+                }
+                scrollBarBackground: Rectangle{
+                    implicitWidth: 14
+                    color: hifi.colors.baseGray
+                }
+
+                handle:
+                    Rectangle {
+                    implicitWidth: 8
+                    anchors.left: parent.left
+                    anchors.leftMargin: 3
+                    anchors.top: parent.top
+                    anchors.bottom: parent.bottom
+                    radius: 3
+                    color: hifi.colors.lightGrayText
+                }
+            }
+
             ListView {
                 id: listView
                 height: textField.height * count * 1.4

interface/resources/qml/controls-uit/ContentSection.qml

@@ -14,7 +14,7 @@ import QtGraphicalEffects 1.0
 import "../styles-uit"
 
 Column {
-    property string name: "Static Section"
+    property string name: "Content Section"
     property bool isFirst: false
     property bool isCollapsible: false  // Set at creation.
     property bool isCollapsed: false

interface/resources/qml/controls-uit/GlyphButton.qml

@@ -0,0 +1,71 @@
+//
+//  GlyphButton.qml
+//
+//  Created by Clement on  3/7/16
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+
+import QtQuick 2.5
+import QtQuick.Controls 1.4 as Original
+import QtQuick.Controls.Styles 1.4
+
+import "../styles-uit"
+
+Original.Button {
+    property int color: 0
+    property int colorScheme: hifi.colorShemes.light
+    property string glyph: ""
+
+    width: 120
+    height: 28
+
+    style: ButtonStyle {
+
+        background: Rectangle {
+            radius: hifi.buttons.radius
+
+            gradient: Gradient {
+                GradientStop {
+                    position: 0.2
+                    color: {
+                        if (!control.enabled) {
+                            hifi.buttons.disabledColorStart[control.colorScheme]
+                        } else if (control.pressed) {
+                            hifi.buttons.pressedColor[control.color]
+                        } else if (control.hovered) {
+                            hifi.buttons.hoveredColor[control.color]
+                        } else {
+                            hifi.buttons.colorStart[control.color]
+                        }
+                    }
+                }
+                GradientStop {
+                    position: 1.0
+                    color: {
+                        if (!control.enabled) {
+                            hifi.buttons.disabledColorFinish[control.colorScheme]
+                        } else if (control.pressed) {
+                            hifi.buttons.pressedColor[control.color]
+                        } else if (control.hovered) {
+                            hifi.buttons.hoveredColor[control.color]
+                        } else {
+                            hifi.buttons.colorFinish[control.color]
+                        }
+                    }
+                }
+            }
+        }
+
+        label: HiFiGlyphs {
+            color: enabled ? hifi.buttons.textColor[control.color]
+                           : hifi.buttons.disabledTextColor[control.colorScheme]
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+            text: control.glyph
+        }
+    }
+}

interface/resources/qml/controls-uit/SpinBox.qml

@@ -21,6 +21,8 @@ SpinBox {
     property int colorScheme: hifi.colorSchemes.light
     readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
     property string label: ""
+    property string labelInside: ""
+    property color colorLabelInside: hifi.colors.white
     property real controlHeight: height + (spinBoxLabel.visible ? spinBoxLabel.height + spinBoxLabel.anchors.bottomMargin : 0)
 
     FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
@@ -31,12 +33,13 @@ SpinBox {
     y: spinBoxLabel.visible ? spinBoxLabel.height + spinBoxLabel.anchors.bottomMargin : 0
 
     style: SpinBoxStyle {
+        id: spinStyle
         background: Rectangle {
             color: isLightColorScheme
                    ? (spinBox.focus ? hifi.colors.white : hifi.colors.lightGray)
                    : (spinBox.focus ? hifi.colors.black : hifi.colors.baseGrayShadow)
-            border.color: hifi.colors.primaryHighlight
-            border.width: spinBox.focus ? 1 : 0
+            border.color: spinBoxLabelInside.visible ? spinBoxLabelInside.color : hifi.colors.primaryHighlight
+            border.width: spinBox.focus ? spinBoxLabelInside.visible ? 2 : 1 : 0
         }
 
         textColor: isLightColorScheme
@@ -46,7 +49,7 @@ SpinBox {
         selectionColor: hifi.colors.primaryHighlight
 
         horizontalAlignment: Qt.AlignLeft
-        padding.left: hifi.dimensions.textPadding
+        padding.left: spinBoxLabelInside.visible ? 30 : hifi.dimensions.textPadding
         padding.right: hifi.dimensions.spinnerSize
 
         incrementControl: HiFiGlyphs {
@@ -76,4 +79,38 @@ SpinBox {
         anchors.bottomMargin: 4
         visible: label != ""
     }
+
+    HifiControls.Label {
+        id: spinBoxLabelInside
+        text: spinBox.labelInside
+        anchors.left: parent.left
+        anchors.leftMargin: 10
+        font.bold: true
+        anchors.verticalCenter: parent.verticalCenter
+        color: spinBox.colorLabelInside
+        visible: spinBox.labelInside != ""
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        propagateComposedEvents: true
+        onWheel: {
+            if(spinBox.focus)
+                wheel.accepted = false
+            else
+                wheel.accepted = true
+        }
+        onPressed: {
+            mouse.accepted = false
+        }
+        onReleased: {
+            mouse.accepted = false
+        }
+        onClicked: {
+            mouse.accepted = false
+        }
+        onDoubleClicked: {
+            mouse.accepted = false
+        }
+    }
 }

interface/resources/qml/controls-uit/TextField.qml

@@ -38,7 +38,7 @@ TextField {
                    : (textField.focus ? hifi.colors.white : hifi.colors.lightGrayText)
         background: Rectangle {
             color: isLightColorScheme
-                   ? (textField.focus ? hifi.colors.white : hifi.colors.lightGray)
+                   ? (textField.focus ? hifi.colors.white : hifi.colors.textFieldLightBackground)
                    : (textField.focus ? hifi.colors.black : hifi.colors.baseGrayShadow)
             border.color: hifi.colors.primaryHighlight
             border.width: textField.focus ? 1 : 0

interface/resources/qml/controls-uit/Tree.qml

@@ -8,6 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+import QtQml.Models 2.2
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
@@ -18,10 +19,16 @@ TreeView {
     id: treeView
 
     property var treeModel: ListModel { }
+    property var canEdit: false
     property int colorScheme: hifi.colorSchemes.light
     readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
 
+    property var modifyEl: function(index, data) { return false; }
+
     model: treeModel
+    selection: ItemSelectionModel {
+        model: treeModel
+    }
 
     TableViewColumn {
         role: "display";
@@ -120,7 +127,9 @@ TreeView {
                    : (styleData.alternate ? hifi.colors.tableRowDarkEven : hifi.colors.tableRowDarkOdd)
     }
 
-    itemDelegate: FiraSansSemiBold {
+    itemDelegate: Loader {
+        id: itemDelegateLoader
+
         anchors {
             left: parent ? parent.left : undefined
             leftMargin: (2 + styleData.depth) * hifi.dimensions.tablePadding
@@ -129,11 +138,83 @@ TreeView {
             verticalCenter: parent ? parent.verticalCenter : undefined
         }
 
-        text: styleData.value
-        size: hifi.fontSizes.tableText
-        color: colorScheme == hifi.colorSchemes.light
-                   ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
-                   : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
+        function getComponent() {
+            if (treeView.canEdit && styleData.selected) {
+                return textFieldComponent;
+            } else {
+                return labelComponent;
+            }
+
+        }
+        sourceComponent: getComponent()
+
+        Component {
+            id: labelComponent
+            FiraSansSemiBold {
+
+                text: styleData.value
+                size: hifi.fontSizes.tableText
+                color: colorScheme == hifi.colorSchemes.light
+                       ? (styleData.selected ? hifi.colors.black : hifi.colors.baseGrayHighlight)
+                       : (styleData.selected ? hifi.colors.black : hifi.colors.lightGrayText)
+            }
+        }
+        Component {
+            id: textFieldComponent
+
+            TextField {
+                id: textField
+                readOnly: !activeFocus
+
+                text: styleData.value
+
+                FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
+                font.family: firaSansSemiBold.name
+                font.pixelSize: hifi.fontSizes.textFieldInput
+                height: hifi.dimensions.tableRowHeight
+
+                style: TextFieldStyle {
+                    textColor: readOnly
+                               ? hifi.colors.black
+                               : (treeView.isLightColorScheme ?  hifi.colors.black :  hifi.colors.white)
+                    background: Rectangle {
+                        visible: !readOnly
+                        color: treeView.isLightColorScheme ? hifi.colors.white : hifi.colors.black
+                        border.color: hifi.colors.primaryHighlight
+                        border.width: 1
+                    }
+                    selectedTextColor: hifi.colors.black
+                    selectionColor: hifi.colors.primaryHighlight
+                    padding.left: readOnly ? 0 : hifi.dimensions.textPadding
+                    padding.right: readOnly ? 0 : hifi.dimensions.textPadding
+                }
+
+                validator: RegExpValidator {
+                    regExp: /[^/]+/
+                }
+
+                Keys.onPressed: {
+                    if (event.key == Qt.Key_Escape) {
+                        text = styleData.value;
+                        unfocusHelper.forceActiveFocus();
+                        event.accepted = true;
+                    }
+                }
+                onAccepted:  {
+                    if (acceptableInput && styleData.selected) {
+                        if (!modifyEl(selection.currentIndex, text)) {
+                            text = styleData.value;
+                        }
+                        unfocusHelper.forceActiveFocus();
+                    }
+                }
+            }
+        }
+    }
+
+    Item {
+        id: unfocusHelper
+        visible: false
     }
 
     onDoubleClicked: isExpanded(index) ? collapse(index) : expand(index)

interface/resources/qml/dialogs/MessageDialog.qml

@@ -51,6 +51,9 @@ ModalWindow {
     property int clickedButton: OriginalDialogs.StandardButton.NoButton;
     focus: defaultButton === OriginalDialogs.StandardButton.NoButton
 
+    property int titleWidth: 0
+    onTitleWidthChanged: d.resize();
+
     function updateIcon() {
         if (!root) {
             return;
@@ -72,7 +75,7 @@ ModalWindow {
             readonly property int maxHeight: 720
 
             function resize() {
-                var targetWidth = mainTextContainer.width
+                var targetWidth = Math.max(titleWidth, mainTextContainer.contentWidth)
                 var targetHeight = mainTextContainer.height + 3 * hifi.dimensions.contentSpacing.y
                         + (informativeTextContainer.text != "" ? informativeTextContainer.contentHeight + 3 * hifi.dimensions.contentSpacing.y : 0)
                         + buttons.height
@@ -96,6 +99,7 @@ ModalWindow {
             }
             lineHeight: 2
             lineHeightMode: Text.ProportionalHeight
+            horizontalAlignment: Text.AlignHCenter
         }
 
         RalewaySemiBold {

interface/resources/qml/dialogs/QueryDialog.qml

@@ -34,8 +34,7 @@ ModalWindow {
     property var items;
     property string label
     property var result;
-    // FIXME not current honored
-    property var current;
+    property alias current: textResult.text
 
     // For text boxes
     property alias placeholderText: textResult.placeholderText
@@ -43,6 +42,9 @@ ModalWindow {
     // For combo boxes
     property bool editable: true;
 
+    property int titleWidth: 0
+    onTitleWidthChanged: d.resize();
+
     function updateIcon() {
         if (!root) {
             return;
@@ -64,7 +66,7 @@ ModalWindow {
             readonly property int maxHeight: 720
 
             function resize() {
-                var targetWidth = pane.width
+                var targetWidth = Math.max(titleWidth, pane.width)
                 var targetHeight = (items ? comboBox.controlHeight : textResult.controlHeight) + 5 * hifi.dimensions.contentSpacing.y + buttons.height
                 root.width = (targetWidth < d.minWidth) ? d.minWidth : ((targetWidth > d.maxWdith) ? d.maxWidth : targetWidth)
                 root.height = (targetHeight < d.minHeight) ? d.minHeight: ((targetHeight > d.maxHeight) ? d.maxHeight : targetHeight)

interface/resources/qml/hifi/MenuOption.qml

@@ -10,6 +10,7 @@ QtObject {
     readonly property string animDebugDrawPosition: "Debug Draw Position";
     readonly property string antialiasing: "Antialiasing";
     readonly property string assetMigration: "ATP Asset Migration";
+    readonly property string assetServer: "Asset Server";
     readonly property string atmosphere: "Atmosphere";
     readonly property string attachments: "Attachments...";
     readonly property string audioNetworkStats: "Audio Network Stats";
@@ -154,7 +155,6 @@ QtObject {
     readonly property string toolWindow: "Tool Window";
     readonly property string transmitterDrive: "Transmitter Drive";
     readonly property string turnWithHead: "Turn using Head";
-    readonly property string uploadAsset: "Upload File to Asset Server";
     readonly property string useAudioForMouth: "Use Audio for Mouth";
     readonly property string useCamera: "Use Camera";
     readonly property string velocityFilter: "Velocity Filter";

interface/resources/qml/hifi/dialogs/AttachmentsDialog.qml

@@ -1,19 +1,25 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
+import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
+import QtQuick.Controls.Styles 1.4
 
-import "../../windows"
+import "../../styles-uit"
+import "../../controls-uit" as HifiControls
+import "../../windows-uit"
 import "attachments"
 
 Window {
     id: root
-    title: "Edit Attachments"
+    title: "Attachments"
     objectName: "AttachmentsDialog"
     width: 600
     height: 600
     resizable: true
-    // User must click OK or cancel to close the window
-    closable: false
+    destroyOnInvisible: true
+    minSize: Qt.vector2d(400, 500)
+
+    HifiConstants { id: hifi }
 
     readonly property var originalAttachments: MyAvatar.getAttachmentsVariant();
     property var attachments: [];
@@ -34,89 +40,150 @@ Window {
         }
     }
 
-    Rectangle {
-        anchors.fill: parent
-        radius: 4
+    Column {
+        width: pane.contentWidth
 
         Rectangle {
-            id: attachmentsBackground
-            anchors { left: parent.left; right: parent.right; top: parent.top; bottom: newAttachmentButton.top; margins: 8 }
-            color: "gray"
+            width: parent.width
+            height: root.height
             radius: 4
+            color: hifi.colors.baseGray
 
-            ScrollView{
-                id: scrollView
-                anchors.fill: parent
-                anchors.margins: 4
-                ListView {
-                    id: listView
-                    model: ListModel {}
-                    delegate:  Item {
-                        implicitHeight: attachmentView.height + 8;
-                        implicitWidth: attachmentView.width;
-                        Attachment {
-                            id: attachmentView
-                            width: scrollView.width
-                            attachment: root.attachments[index]
-                            onDeleteAttachment: {
-                                attachments.splice(index, 1);
-                                listView.model.remove(index, 1);
+            Rectangle {
+                id: attachmentsBackground
+                anchors { left: parent.left; right: parent.right; top: parent.top; bottom: newAttachmentButton.top; margins: 8 }
+                color: hifi.colors.baseGrayShadow
+                radius: 4
+
+                ScrollView {
+                    id: scrollView
+                    anchors.fill: parent
+                    anchors.margins: 4
+
+                    style: ScrollViewStyle {
+
+                        padding {
+                            top: 0
+                            right: 0
+                            bottom: 0
+                        }
+
+                        decrementControl: Item {
+                            visible: false
+                        }
+                        incrementControl: Item {
+                            visible: false
+                        }
+                        scrollBarBackground: Rectangle{
+                            implicitWidth: 14
+                            color: hifi.colors.baseGray
+                            radius: 4
+                            Rectangle {
+                                // Make top left corner of scrollbar appear square
+                                width: 8
+                                height: 4
+                                color: hifi.colors.baseGray
+                                anchors.top: parent.top
+                                anchors.horizontalCenter: parent.left
                             }
-                            onUpdateAttachment: MyAvatar.setAttachmentsVariant(attachments);
+
+                        }
+                        handle:
+                            Rectangle {
+                            implicitWidth: 8
+                            anchors {
+                                left: parent.left
+                                leftMargin: 3
+                                top: parent.top
+                                topMargin: 3
+                                bottom: parent.bottom
+                                bottomMargin: 4
+                            }
+                            radius: 4
+                            color: hifi.colors.lightGrayText
                         }
                     }
-                    onCountChanged: MyAvatar.setAttachmentsVariant(attachments);
+
+                    ListView {
+                        id: listView
+                        model: ListModel {}
+                        delegate: Item {
+                            id: attachmentDelegate
+                            implicitHeight: attachmentView.height + 8;
+                            implicitWidth: attachmentView.width
+                            Attachment {
+                                id: attachmentView
+                                width: scrollView.width
+                                attachment: root.attachments[index]
+                                onDeleteAttachment: {
+                                    attachments.splice(index, 1);
+                                    listView.model.remove(index, 1);
+                                }
+                                onUpdateAttachment: MyAvatar.setAttachmentsVariant(attachments);
+                            }
+                        }
+                        onCountChanged: MyAvatar.setAttachmentsVariant(attachments);
+                    }
                 }
             }
-        }
 
-        Button {
-            id: newAttachmentButton
-            anchors { left: parent.left; right: parent.right; bottom: buttonRow.top; margins: 8 }
-            text: "New Attachment"
-
-            onClicked: {
-                var template = {
-                    modelUrl: "",
-                    translation: { x: 0, y: 0, z: 0 },
-                    rotation: { x: 0, y: 0, z: 0 },
-                    scale: 1,
-                    jointName: MyAvatar.jointNames[0],
-                    soft: false
-                };
-                attachments.push(template);
-                listView.model.append({});
-                MyAvatar.setAttachmentsVariant(attachments);
-            }
-        }
-
-        Row {
-            id: buttonRow
-            spacing: 8
-            anchors { right: parent.right; bottom: parent.bottom; margins: 8 }
-            Button { action: cancelAction }
-            Button { action: okAction }
-        }
-
-        Action {
-            id: cancelAction
-            text: "Cancel"
-            onTriggered: {
-                MyAvatar.setAttachmentsVariant(originalAttachments);
-                root.destroy()
-            }
-        }
-
-        Action {
-            id: okAction
-            text: "OK"
-            onTriggered: {
-                for (var i = 0; i < attachments.length; ++i) {
-                    console.log("Attachment " + i + ": " + attachments[i]);
+            HifiControls.Button {
+                id: newAttachmentButton
+                anchors { left: parent.left; right: parent.right; bottom: buttonRow.top; margins: 8 }
+                text: "New Attachment"
+                color: hifi.buttons.black
+                colorScheme: hifi.colorSchemes.dark
+                onClicked: {
+                    var template = {
+                        modelUrl: "",
+                        translation: { x: 0, y: 0, z: 0 },
+                        rotation: { x: 0, y: 0, z: 0 },
+                        scale: 1,
+                        jointName: MyAvatar.jointNames[0],
+                        soft: false
+                    };
+                    attachments.push(template);
+                    listView.model.append({});
+                    MyAvatar.setAttachmentsVariant(attachments);
                 }
+            }
 
-                MyAvatar.setAttachmentsVariant(attachments);
-                root.destroy()
+            Row {
+                id: buttonRow
+                spacing: 8
+                anchors { right: parent.right; bottom: parent.bottom; margins: 8 }
+                HifiControls.Button {
+                    action: okAction
+                    color: hifi.buttons.black
+                    colorScheme: hifi.colorSchemes.dark
+                }
+                HifiControls.Button {
+                    action: cancelAction
+                    color: hifi.buttons.black
+                    colorScheme: hifi.colorSchemes.dark
+                }
+            }
+
+            Action {
+                id: cancelAction
+                text: "Cancel"
+                onTriggered: {
+                    MyAvatar.setAttachmentsVariant(originalAttachments);
+                    root.destroy()
+                }
+            }
+
+            Action {
+                id: okAction
+                text: "OK"
+                onTriggered: {
+                    for (var i = 0; i < attachments.length; ++i) {
+                        console.log("Attachment " + i + ": " + attachments[i]);
+                    }
+
+                    MyAvatar.setAttachmentsVariant(attachments);
+                    root.destroy()
+                }
             }
         }
     }

interface/resources/qml/hifi/dialogs/ModelBrowserDialog.qml

@@ -7,36 +7,45 @@ import "../../windows"
 import "../../js/Utils.js" as Utils
 import "../models"
 
-ModalWindow {
+import "../../styles-uit"
+import "../../controls-uit" as HifiControls
+import "../../windows-uit"
+
+Window {
     id: root
     resizable: true
-    width: 640
+    width: 600
     height: 480
+    closable: false
 
     property var result;
 
     signal selected(var modelUrl);
     signal canceled();
 
-    Rectangle {
-        anchors.fill: parent
-        color: "white"
+    HifiConstants {id: hifi}
 
-        Item {
-            anchors { fill: parent; margins: 8 }
+    Column {
+        width: pane.contentWidth
 
-            TextField {
+        Rectangle {
+            width: parent.width
+            height: root.height
+            radius: 4
+            color: hifi.colors.baseGray
+
+            HifiControls.TextField {
                 id: filterEdit
-                style:  TextFieldStyle { renderType: Text.QtRendering }
-                anchors { left: parent.left; right: parent.right; top: parent.top }
+                anchors { left: parent.left; right: parent.right; top: parent.top ; margins: 8}
                 placeholderText: "filter"
                 onTextChanged: tableView.model.filter = text
+                colorScheme: hifi.colorSchemes.dark
             }
 
-            TableView {
+            HifiControls.AttachmentsTable {
                 id: tableView
-                anchors { left: parent.left; right: parent.right; top: filterEdit.bottom; topMargin: 8; bottom: buttonRow.top; bottomMargin: 8 }
-                model: S3Model{}
+                anchors { left: parent.left; right: parent.right; top: filterEdit.bottom; bottom: buttonRow.top; margins: 8; }
+                colorScheme: hifi.colorSchemes.dark
                 onCurrentRowChanged: {
                     if (currentRow == -1) {
                         root.result = null;
@@ -44,60 +53,14 @@ ModalWindow {
                     }
                     result = model.baseUrl + "/" + model.get(tableView.currentRow).key;
                 }
-                itemDelegate: Component {
-                    Item {
-                        clip: true
-                        Text {
-                            x: 3
-                            anchors.verticalCenter: parent.verticalCenter
-                            color: tableView.activeFocus && styleData.row === tableView.currentRow ? "yellow" : styleData.textColor
-                            elide: styleData.elideMode
-                            text: getText()
-
-                            function getText() {
-                                switch(styleData.column) {
-                                    case 1:
-                                        return Utils.formatSize(styleData.value)
-                                    default:
-                                        return styleData.value;
-                                }
-                            }
-
-                        }
-                    }
-                }
-                TableViewColumn {
-                    role: "name"
-                    title: "Name"
-                    width: 200
-                }
-                TableViewColumn {
-                    role: "size"
-                    title: "Size"
-                    width: 100
-                }
-                TableViewColumn {
-                    role: "modified"
-                    title: "Last Modified"
-                    width: 200
-                }
-                Rectangle {
-                    anchors.fill: parent
-                    visible: tableView.model.status !== XmlListModel.Ready
-                    color: "#7fffffff"
-                    BusyIndicator {
-                        anchors.centerIn: parent
-                        width: 48; height: 48
-                        running: true
-                    }
-                }
             }
 
             Row {
                 id: buttonRow
-                anchors { right: parent.right; bottom: parent.bottom }
-                Button { action: acceptAction }
-                Button { action: cancelAction }
+                spacing: 8
+                anchors { right: parent.right; rightMargin: 8; bottom: parent.bottom; bottomMargin: 8; }
+                HifiControls.Button { action: acceptAction ;  color: hifi.buttons.black; colorScheme: hifi.colorSchemes.dark }
+                HifiControls.Button { action: cancelAction ;  color: hifi.buttons.black; colorScheme: hifi.colorSchemes.dark }
             }
 
             Action {
@@ -121,7 +84,6 @@ ModalWindow {
                 }
             }
         }
-
     }
 }
 

interface/resources/qml/hifi/dialogs/attachments/Attachment.qml

@@ -1,22 +1,27 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
+import QtQuick.Dialogs 1.2 as OriginalDialogs
+import Qt.labs.settings 1.0
 
-import "../../../windows"
-import "../../../controls" as VrControls
 import "."
 import ".."
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControls
+import "../../../windows-uit"
 
 Item {
     height: column.height + 2 * 8
 
     property var attachment;
 
+    HifiConstants { id: hifi }
+
     signal deleteAttachment(var attachment);
     signal updateAttachment();
     property bool completed: false;
 
-    Rectangle { color: "white"; anchors.fill: parent; radius: 4 }
+    Rectangle { color: hifi.colors.baseGray; anchors.fill: parent; radius: 4 }
 
     Component.onCompleted: {
         completed = true;
@@ -25,17 +30,18 @@ Item {
     Column {
         y: 8
         id: column
-        anchors { left: parent.left; right: parent.right; margins: 8 }
+        anchors { left: parent.left; right: parent.right; margins: 20 }
         spacing: 8
 
         Item {
-            height: modelChooserButton.height
-            anchors { left: parent.left; right: parent.right; }
-            Text { id: urlLabel; text: "Model URL:"; width: 80; anchors.verticalCenter: modelUrl.verticalCenter }
-            VrControls.TextField {
+            height: modelChooserButton.height + urlLabel.height + 4
+            anchors { left: parent.left; right: parent.right;}
+            HifiControls.Label { id: urlLabel; color: hifi.colors.lightGrayText; text: "Model URL"; anchors.top: parent.top;}
+            HifiControls.TextField {
                 id: modelUrl;
                 height:  jointChooser.height;
-                anchors { left: urlLabel.right; leftMargin: 8; rightMargin: 8; right: modelChooserButton.left }
+                colorScheme: hifi.colorSchemes.dark
+                anchors { bottom: parent.bottom; left: parent.left; rightMargin: 8; right: modelChooserButton.left }
                 text: attachment ? attachment.modelUrl : ""
                 onTextChanged: {
                     if (completed && attachment && attachment.modelUrl !== text) {
@@ -44,17 +50,19 @@ Item {
                     }
                 }
             }
-            Button {
+            HifiControls.Button {
                 id: modelChooserButton;
                 text: "Choose";
+                color: hifi.buttons.black
+                colorScheme: hifi.colorSchemes.dark
                 anchors { right: parent.right; verticalCenter: modelUrl.verticalCenter }
                 Component {
-                    id: modelBrowserBuiler;
+                    id: modelBrowserBuilder;
                     ModelBrowserDialog {}
                 }
 
                 onClicked: {
-                    var browser = modelBrowserBuiler.createObject(desktop);
+                    var browser = modelBrowserBuilder.createObject(desktop);
                     browser.selected.connect(function(newModelUrl){
                         modelUrl.text = newModelUrl;
                     })
@@ -63,18 +71,19 @@ Item {
         }
 
         Item {
-            height: jointChooser.height
+            height: jointChooser.height + jointLabel.height + 4
             anchors { left: parent.left; right: parent.right; }
-            Text {
+            HifiControls.Label {
                 id: jointLabel;
-                width: 80;
-                text: "Joint:";
-                anchors.verticalCenter: jointChooser.verticalCenter;
+                text: "Joint";
+                color: hifi.colors.lightGrayText;
+                anchors.top: parent.top
             }
-            VrControls.ComboBox {
+            HifiControls.ComboBox {
                 id: jointChooser;
-                anchors { left: jointLabel.right; leftMargin: 8; right: parent.right }
+                anchors { bottom: parent.bottom; left: parent.left; right: parent.right }
                 model: MyAvatar.jointNames
+                colorScheme: hifi.colorSchemes.dark
                 currentIndex: attachment ? model.indexOf(attachment.jointName) : -1
                 onCurrentIndexChanged: {
                     if (completed && attachment && currentIndex != -1 && currentText && currentText !== attachment.jointName) {
@@ -86,12 +95,12 @@ Item {
         }
 
         Item {
-            height: translation.height
+            height: translation.height + translationLabel.height + 4
             anchors { left: parent.left; right: parent.right; }
-            Text { id: translationLabel; width: 80; text: "Translation:"; anchors.verticalCenter: translation.verticalCenter; }
+            HifiControls.Label { id: translationLabel; color: hifi.colors.lightGrayText; text: "Translation"; anchors.top: parent.top; }
             Translation {
                 id: translation;
-                anchors { left: translationLabel.right; leftMargin: 8; right: parent.right }
+                anchors { left: parent.left; right: parent.right; bottom: parent.bottom}
                 vector: attachment ? attachment.translation : {x: 0, y: 0, z: 0};
                 onValueChanged: {
                     if (completed && attachment) {
@@ -103,12 +112,12 @@ Item {
         }
 
         Item {
-            height: rotation.height
+            height: rotation.height + rotationLabel.height + 4
             anchors { left: parent.left; right: parent.right; }
-            Text { id: rotationLabel; width: 80; text: "Rotation:"; anchors.verticalCenter: rotation.verticalCenter; }
+            HifiControls.Label { id: rotationLabel; color: hifi.colors.lightGrayText; text: "Rotation"; anchors.top: parent.top; }
             Rotation {
                 id: rotation;
-                anchors { left: rotationLabel.right; leftMargin: 8; right: parent.right }
+                anchors { left: parent.left; right: parent.right; bottom: parent.bottom; }
                 vector: attachment ? attachment.rotation : {x: 0, y: 0, z: 0};
                 onValueChanged: {
                     if (completed && attachment) {
@@ -120,44 +129,61 @@ Item {
         }
 
         Item {
-            height: scaleSpinner.height
+            height: scaleItem.height
             anchors { left: parent.left; right: parent.right; }
-            Text { id: scaleLabel; width: 80; text: "Scale:"; anchors.verticalCenter: scale.verticalCenter; }
-            SpinBox {
-                id: scaleSpinner;
-                anchors { left: scaleLabel.right; leftMargin: 8; right: parent.right }
-                decimals: 1;
-                minimumValue: 0.1
-                maximumValue: 10
-                stepSize: 0.1;
-                value: attachment ? attachment.scale : 1.0
-                onValueChanged: {
-                    if (completed && attachment && attachment.scale !== value) {
-                        attachment.scale = value;
-                        updateAttachment();
+
+            Item {
+                id: scaleItem
+                height: scaleSpinner.height + scaleLabel.height + 4
+                width: parent.width / 3 - 8
+                anchors { right: parent.right; }
+                HifiControls.Label { id: scaleLabel; color: hifi.colors.lightGrayText; text: "Scale"; anchors.top: parent.top; }
+                HifiControls.SpinBox {
+                    id: scaleSpinner;
+                    anchors { left: parent.left; right: parent.right; bottom: parent.bottom; }
+                    decimals: 1;
+                    minimumValue: 0.1
+                    maximumValue: 10
+                    stepSize: 0.1;
+                    value: attachment ? attachment.scale : 1.0
+                    colorScheme: hifi.colorSchemes.dark
+                    onValueChanged: {
+                        if (completed && attachment && attachment.scale !== value) {
+                            attachment.scale = value;
+                            updateAttachment();
+                        }
+                    }
+                }
+            }
+
+            Item {
+                id: isSoftItem
+                height: scaleSpinner.height
+                anchors {
+                    left: parent.left
+                    bottom: parent.bottom
+                }
+                HifiControls.CheckBox {
+                    id: soft
+                    text: "Is soft"
+                    anchors {
+                        left: parent.left
+                        verticalCenter: parent.verticalCenter
+                    }
+                    checked: attachment ? attachment.soft : false
+                    colorScheme: hifi.colorSchemes.dark
+                    onCheckedChanged: {
+                        if (completed && attachment && attachment.soft !== checked) {
+                            attachment.soft = checked;
+                            updateAttachment();
+                        }
                     }
                 }
             }
         }
-
-        Item {
-            height: soft.height
-            anchors { left: parent.left; right: parent.right; }
-            Text { id: softLabel; width: 80; text: "Is soft:"; anchors.verticalCenter: soft.verticalCenter; }
-            CheckBox {
-                id: soft;
-                anchors { left: softLabel.right; leftMargin: 8; right: parent.right }
-                checked: attachment ? attachment.soft : false
-                onCheckedChanged: {
-                    if (completed && attachment && attachment.soft !== checked) {
-                        attachment.soft = checked;
-                        updateAttachment();
-                    }
-                }
-            }
-        }
-
-        Button {
+        HifiControls.Button {
+            color: hifi.buttons.black
+            colorScheme: hifi.colorSchemes.dark
             anchors { left: parent.left; right: parent.right; }
             text: "Delete"
             onClicked: deleteAttachment(root.attachment);

interface/resources/qml/hifi/dialogs/attachments/Translation.qml

@@ -1,7 +1,7 @@
 import "."
 
 Vector3 {
-    decimals: 2;
+    decimals: 3;
     stepSize: 0.01;
     maximumValue: 10
     minimumValue: -10

interface/resources/qml/hifi/dialogs/attachments/Vector3.qml

@@ -1,6 +1,10 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 
+import "../../../styles-uit"
+import "../../../controls-uit" as HifiControls
+import "../../../windows-uit"
+
 Item {
     id: root
     implicitHeight: xspinner.height
@@ -14,12 +18,16 @@ Item {
 
     signal valueChanged();
 
-    SpinBox {
+    HifiConstants { id: hifi }
+
+    HifiControls.SpinBox {
         id: xspinner
         width: root.spinboxWidth
         anchors { left: parent.left }
         value: root.vector.x
-
+        labelInside: "X:"
+        colorScheme: hifi.colorSchemes.dark
+        colorLabelInside: hifi.colors.redHighlight
         decimals: root.decimals
         stepSize: root.stepSize
         maximumValue: root.maximumValue
@@ -32,12 +40,14 @@ Item {
         }
     }
 
-    SpinBox {
+    HifiControls.SpinBox {
         id: yspinner
         width: root.spinboxWidth
         anchors { horizontalCenter: parent.horizontalCenter }
         value: root.vector.y
-
+        labelInside: "Y:"
+        colorLabelInside: hifi.colors.greenHighlight
+        colorScheme: hifi.colorSchemes.dark
         decimals: root.decimals
         stepSize: root.stepSize
         maximumValue: root.maximumValue
@@ -50,12 +60,14 @@ Item {
         }
     }
 
-    SpinBox {
+    HifiControls.SpinBox {
         id: zspinner
         width: root.spinboxWidth
         anchors { right: parent.right; }
         value: root.vector.z
-
+        labelInside: "Z:"
+        colorLabelInside: hifi.colors.primaryHighlight
+        colorScheme: hifi.colorSchemes.dark
         decimals: root.decimals
         stepSize: root.stepSize
         maximumValue: root.maximumValue

interface/resources/qml/styles-uit/HifiConstants.qml

@@ -35,7 +35,7 @@ Item {
                 glyph = hifi.glyphs.alert;
                 break;
             case hifi.icons.critical:
-                glyph = hifi.glyphs.critical;
+                glyph = hifi.glyphs.error;
                 break;
             case hifi.icons.placemark:
                 glyph = hifi.glyphs.placemark;
@@ -75,6 +75,7 @@ Item {
         readonly property color lightGrayText80: "#ccafafaf"
         readonly property color faintGray80: "#cce3e3e3"
         readonly property color faintGray50: "#80e3e3e3"
+        readonly property color locked: "#252525"
 
         // Other colors
         readonly property color white: "#ffffff"
@@ -113,6 +114,7 @@ Item {
         readonly property color dropDownLightFinish: "#afafaf"
         readonly property color dropDownDarkStart: "#7d7d7d"
         readonly property color dropDownDarkFinish: "#6b6a6b"
+        readonly property color textFieldLightBackground: "#d4d4d4"
     }
 
     Item {
@@ -135,6 +137,7 @@ Item {
         readonly property real spinnerSize: 42
         readonly property real tablePadding: 12
         readonly property real tableRowHeight: largeScreen ? 26 : 23
+        readonly property real tableHeaderHeight: 40
         readonly property vector2d modalDialogMargin: Qt.vector2d(50, 30)
         readonly property real modalDialogTitleHeight: 40
         readonly property real controlLineHeight: 29  // Height of spinbox control on 1920 x 1080 monitor
@@ -164,32 +167,6 @@ Item {
         readonly property real disclosureButton: dimensions.largeScreen ? 20 : 15
     }
 
-    Item {
-        id: glyphs
-        readonly property string alert: "+"
-        readonly property string backward: "E"
-        readonly property string caratDn: "5"
-        readonly property string caratR: "3"
-        readonly property string caratUp: "6"
-        readonly property string close: "w"
-        readonly property string closeInverted: "x"
-        readonly property string closeSmall: "C"
-        readonly property string critical: "="
-        readonly property string disclosureButtonCollapse: "M"
-        readonly property string disclosureButtonExpand: "L"
-        readonly property string disclosureCollapse: "Z"
-        readonly property string disclosureExpand: "B"
-        readonly property string forward: "D"
-        readonly property string info: "["
-        readonly property string noIcon: ""
-        readonly property string pin: "y"
-        readonly property string pinInverted: "z"
-        readonly property string placemark: "U"
-        readonly property string question: "]"
-        readonly property string reloadSmall: "a"
-        readonly property string resizeHandle: "A"
-    }
-
     Item {
         id: icons
         // Values per OffscreenUi::Icon
@@ -208,8 +185,13 @@ Item {
         readonly property int red: 2
         readonly property int black: 3
         readonly property var textColor: [ colors.darkGray, colors.white, colors.white, colors.white ]
-        readonly property var colorStart: [ "#ffffff", "#00b4ef", "#d42043", "#343434" ]
-        readonly property var colorFinish: [ "#afafaf", "#1080b8", "#94132e", "#000000" ]
+        readonly property var colorStart: [ colors.white, colors.primaryHighlight, "#d42043", "#343434" ]
+        readonly property var colorFinish: [ colors.lightGrayText, colors.blueAccent, "#94132e", colors.black ]
+        readonly property var hoveredColor: [ colorStart[white], colorStart[blue], colorStart[red], colorFinish[black] ]
+        readonly property var pressedColor: [ colorFinish[white], colorFinish[blue], colorFinish[red], colorStart[black] ]
+        readonly property var disabledColorStart: [ colorStart[white], colors.baseGrayHighlight]
+        readonly property var disabledColorFinish: [ colorFinish[white], colors.baseGrayShadow]
+        readonly property var disabledTextColor: [ colors.lightGrayText, colors.baseGrayShadow]
         readonly property int radius: 5
     }
 
@@ -217,4 +199,103 @@ Item {
         id: effects
         readonly property int fadeInDuration: 300
     }
+    Item {
+        id: glyphs
+        readonly property string noIcon: ""
+        readonly property string hmd: "b"
+        readonly property string screen: "c"
+        readonly property string keyboard: "d"
+        readonly property string handControllers: "e"
+        readonly property string headphonesMic: "f"
+        readonly property string gamepad: "g"
+        readonly property string headphones: "h"
+        readonly property string mic: "i"
+        readonly property string upload: "j"
+        readonly property string script: "k"
+        readonly property string text: "l"
+        readonly property string cube: "m"
+        readonly property string sphere: "n"
+        readonly property string zone: "o"
+        readonly property string light: "p"
+        readonly property string web: "q"
+        readonly property string web2: "r"
+        readonly property string edit: "s"
+        readonly property string market: "t"
+        readonly property string directory: "u"
+        readonly property string menu: "v"
+        readonly property string close: "w"
+        readonly property string closeInverted: "x"
+        readonly property string pin: "y"
+        readonly property string pinInverted: "z"
+        readonly property string resizeHandle: "A"
+        readonly property string disclosureExpand: "B"
+        readonly property string reloadSmall: "a"
+        readonly property string closeSmall: "C"
+        readonly property string forward: "D"
+        readonly property string backward: "E"
+        readonly property string reload: "F"
+        readonly property string unmuted: "G"
+        readonly property string muted: "H"
+        readonly property string minimize: "I"
+        readonly property string maximize: "J"
+        readonly property string maximizeInverted: "K"
+        readonly property string disclosureButtonExpand: "L"
+        readonly property string disclosureButtonCollapse: "M"
+        readonly property string scriptStop: "N"
+        readonly property string scriptReload: "O"
+        readonly property string scriptRun: "P"
+        readonly property string scriptNew: "Q"
+        readonly property string hifiForum: "2"
+        readonly property string hifiLogoSmall: "S"
+        readonly property string avatar1: "T"
+        readonly property string placemark: "U"
+        readonly property string box: "V"
+        readonly property string community: "0"
+        readonly property string grabHandle: "X"
+        readonly property string search: "Y"
+        readonly property string disclosureCollapse: "Z"
+        readonly property string scriptUpload: "R"
+        readonly property string code: "W"
+        readonly property string avatar: "<"
+        readonly property string arrowsH: ":"
+        readonly property string arrowsV: ";"
+        readonly property string arrows: "`"
+        readonly property string compress: "!"
+        readonly property string expand: "\""
+        readonly property string placemark1: "#"
+        readonly property string circle: "$"
+        readonly property string handPointer: "9"
+        readonly property string plusSquareO: "%"
+        readonly property string sliders: "&"
+        readonly property string square: "'"
+        readonly property string alignCenter: "8"
+        readonly property string alignJustify: ")"
+        readonly property string alignLeft: "*"
+        readonly property string alignRight: "^"
+        readonly property string bars: "7"
+        readonly property string circleSlash: ","
+        readonly property string sync: "()"
+        readonly property string key: "-"
+        readonly property string link: "."
+        readonly property string location: "/"
+        readonly property string caratR: "3"
+        readonly property string caratL: "4"
+        readonly property string caratDn: "5"
+        readonly property string caratUp: "6"
+        readonly property string folderLg: ">"
+        readonly property string folderSm: "?"
+        readonly property string levelUp: "1"
+        readonly property string info: "["
+        readonly property string question: "]"
+        readonly property string alert: "+"
+        readonly property string home: "_"
+        readonly property string error: "="
+        readonly property string settings: "@"
+        readonly property string trash: "{"
+        readonly property string objectGroup: "&#xe000;"
+        readonly property string cm: "}"
+        readonly property string msvg79: "~"
+        readonly property string deg: "\\"
+        readonly property string px: "|"
+    }
 }

interface/resources/qml/windows-uit/ModalFrame.qml

@@ -50,6 +50,8 @@ Frame {
                 width: title.width + (icon.text !== "" ? icon.width + hifi.dimensions.contentSpacing.x : 0)
                 x: (parent.width - width) / 2
 
+                onWidthChanged: window.titleWidth = width
+
                 HiFiGlyphs {
                     id: icon
                     text: window.iconText ? window.iconText : ""

interface/src/Application.cpp

@@ -141,6 +141,7 @@
 #include "ModelPackager.h"
 #include "PluginContainerProxy.h"
 #include "scripting/AccountScriptingInterface.h"
+#include "scripting/AssetMappingsScriptingInterface.h"
 #include "scripting/AudioDeviceScriptingInterface.h"
 #include "scripting/ClipboardScriptingInterface.h"
 #include "scripting/DesktopScriptingInterface.h"
@@ -158,7 +159,6 @@
 #include "Stars.h"
 #include "ui/AddressBarDialog.h"
 #include "ui/AvatarInputs.h"
-#include "ui/AssetUploadDialogFactory.h"
 #include "ui/DialogsManager.h"
 #include "ui/LoginDialog.h"
 #include "ui/overlays/Cube3DOverlay.h"
@@ -195,6 +195,7 @@ static const QString FBX_EXTENSION  = ".fbx";
 static const QString OBJ_EXTENSION  = ".obj";
 static const QString AVA_JSON_EXTENSION = ".ava.json";
 
+static const int MSECS_PER_SEC = 1000;
 static const int MIRROR_VIEW_TOP_PADDING = 5;
 static const int MIRROR_VIEW_LEFT_PADDING = 10;
 static const int MIRROR_VIEW_WIDTH = 265;
@@ -239,29 +240,26 @@ class DeadlockWatchdogThread : public QThread {
 public:
     static const unsigned long HEARTBEAT_CHECK_INTERVAL_SECS = 1;
     static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1;
-#ifdef DEBUG
-    static const unsigned long MAX_HEARTBEAT_AGE_USECS = 600 * USECS_PER_SECOND;
-#else
-    static const unsigned long MAX_HEARTBEAT_AGE_USECS = 10 * USECS_PER_SECOND;
-#endif
-
+    static const unsigned long HEARTBEAT_REPORT_INTERVAL_USECS = 5 * USECS_PER_SECOND;
+    static const unsigned long MAX_HEARTBEAT_AGE_USECS = 30 * USECS_PER_SECOND;
+    static const int WARNING_ELAPSED_HEARTBEAT = 500 * USECS_PER_MSEC; // warn if elapsed heartbeat average is large
+    static const int HEARTBEAT_SAMPLES = 100000; // ~5 seconds worth of samples
+    
     // Set the heartbeat on launch
     DeadlockWatchdogThread() {
         setObjectName("Deadlock Watchdog");
-        QTimer* heartbeatTimer = new QTimer();
         // Give the heartbeat an initial value
-        updateHeartbeat();
-        connect(heartbeatTimer, &QTimer::timeout, [this] {
-            updateHeartbeat();
-        });
-        heartbeatTimer->start(HEARTBEAT_UPDATE_INTERVAL_SECS * MSECS_PER_SECOND);
+        _heartbeat = usecTimestampNow();
         connect(qApp, &QCoreApplication::aboutToQuit, [this] {
             _quit = true;
         });
     }
 
     void updateHeartbeat() {
-        _heartbeat = usecTimestampNow();
+        auto now = usecTimestampNow();
+        auto elapsed = now - _heartbeat;
+        _movingAverage.addSample(elapsed);
+        _heartbeat = now;
     }
 
     void deadlockDetectionCrash() {
@@ -272,19 +270,72 @@ public:
     void run() override {
         while (!_quit) {
             QThread::sleep(HEARTBEAT_UPDATE_INTERVAL_SECS);
-            auto now = usecTimestampNow();
-            auto lastHeartbeatAge = now - _heartbeat;
+
+            uint64_t lastHeartbeat = _heartbeat; // sample atomic _heartbeat, because we could context switch away and have it updated on us
+            uint64_t now = usecTimestampNow();
+            auto lastHeartbeatAge = (now > lastHeartbeat) ? now - lastHeartbeat : 0;
+            auto sinceLastReport = (now > _lastReport) ? now - _lastReport : 0;
+            auto elapsedMovingAverage = _movingAverage.getAverage();
+
+            if (elapsedMovingAverage > _maxElapsedAverage) {
+                qDebug() << "DEADLOCK WATCHDOG NEW maxElapsedAverage:"
+                    << "lastHeartbeatAge:" << lastHeartbeatAge
+                    << "elapsedMovingAverage:" << elapsedMovingAverage
+                    << "maxElapsed:" << _maxElapsed
+                    << "PREVIOUS maxElapsedAverage:" << _maxElapsedAverage
+                    << "NEW maxElapsedAverage:" << elapsedMovingAverage
+                    << "samples:" << _movingAverage.getSamples();
+                _maxElapsedAverage = elapsedMovingAverage;
+            }
+            if (lastHeartbeatAge > _maxElapsed) {
+                qDebug() << "DEADLOCK WATCHDOG NEW maxElapsed:"
+                    << "lastHeartbeatAge:" << lastHeartbeatAge
+                    << "elapsedMovingAverage:" << elapsedMovingAverage
+                    << "PREVIOUS maxElapsed:" << _maxElapsed
+                    << "NEW maxElapsed:" << lastHeartbeatAge
+                    << "maxElapsedAverage:" << _maxElapsedAverage
+                    << "samples:" << _movingAverage.getSamples();
+                _maxElapsed = lastHeartbeatAge;
+            }
+            if ((sinceLastReport > HEARTBEAT_REPORT_INTERVAL_USECS) || (elapsedMovingAverage > WARNING_ELAPSED_HEARTBEAT)) {
+                qDebug() << "DEADLOCK WATCHDOG STATUS -- lastHeartbeatAge:" << lastHeartbeatAge
+                         << "elapsedMovingAverage:" << elapsedMovingAverage
+                         << "maxElapsed:" << _maxElapsed
+                         << "maxElapsedAverage:" << _maxElapsedAverage
+                         << "samples:" << _movingAverage.getSamples();
+                _lastReport = now;
+            }
+
+#ifdef NDEBUG
             if (lastHeartbeatAge > MAX_HEARTBEAT_AGE_USECS) {
+                qDebug() << "DEADLOCK DETECTED -- "
+                         << "lastHeartbeatAge:" << lastHeartbeatAge
+                         << "[ lastHeartbeat :" << lastHeartbeat
+                         << "now:" << now << " ]"
+                         << "elapsedMovingAverage:" << elapsedMovingAverage
+                         << "maxElapsed:" << _maxElapsed
+                         << "maxElapsedAverage:" << _maxElapsedAverage
+                         << "samples:" << _movingAverage.getSamples();
                 deadlockDetectionCrash();
             }
+#endif
         }
     }
 
     static std::atomic<uint64_t> _heartbeat;
+    static std::atomic<uint64_t> _lastReport;
+    static std::atomic<uint64_t> _maxElapsed;
+    static std::atomic<int> _maxElapsedAverage;
+    static ThreadSafeMovingAverage<int, HEARTBEAT_SAMPLES> _movingAverage;
+
     bool _quit { false };
 };
 
 std::atomic<uint64_t> DeadlockWatchdogThread::_heartbeat;
+std::atomic<uint64_t> DeadlockWatchdogThread::_lastReport;
+std::atomic<uint64_t> DeadlockWatchdogThread::_maxElapsed;
+std::atomic<int> DeadlockWatchdogThread::_maxElapsedAverage;
+ThreadSafeMovingAverage<int, DeadlockWatchdogThread::HEARTBEAT_SAMPLES> DeadlockWatchdogThread::_movingAverage;
 
 #ifdef Q_OS_WIN
 class MyNativeEventFilter : public QAbstractNativeEventFilter {
@@ -367,7 +418,7 @@ bool setupEssentials(int& argc, char** argv) {
 
     Setting::preInit();
 
-    CrashHandler::checkForAndHandleCrash();
+    bool previousSessionCrashed = CrashHandler::checkForAndHandleCrash();
     CrashHandler::writeRunningMarkerFiler();
     qAddPostRoutine(CrashHandler::deleteRunningMarkerFile);
 
@@ -429,7 +480,7 @@ bool setupEssentials(int& argc, char** argv) {
     DependencyManager::set<InterfaceParentFinder>();
     DependencyManager::set<EntityTreeRenderer>(true, qApp, qApp);
     DependencyManager::set<CompositorHelper>();
-    return true;
+    return previousSessionCrashed;
 }
 
 // FIXME move to header, or better yet, design some kind of UI manager
@@ -450,10 +501,13 @@ PluginContainer* _pluginContainer;
 OffscreenGLCanvas* _chromiumShareContext { nullptr };
 Q_GUI_EXPORT void qt_gl_set_global_share_context(QOpenGLContext *context);
 
+Setting::Handle<int> sessionRunTime{ "sessionRunTime", 0 };
+
 Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     QApplication(argc, argv),
-    _dependencyManagerIsSetup(setupEssentials(argc, argv)),
     _window(new MainWindow(desktop())),
+    _sessionRunTimer(startupTimer),
+    _previousSessionCrashed(setupEssentials(argc, argv)),
     _undoStackScriptingInterface(&_undoStack),
     _frameCount(0),
     _fps(60.0f),
@@ -509,8 +563,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     auto nodeList = DependencyManager::get<NodeList>();
 
     // Set up a watchdog thread to intentionally crash the application on deadlocks
-    auto deadlockWatchdog = new DeadlockWatchdogThread();
-    deadlockWatchdog->start();
+    _deadlockWatchdogThread = new DeadlockWatchdogThread();
+    _deadlockWatchdogThread->start();
 
     qCDebug(interfaceapp) << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
 
@@ -584,7 +638,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
 
     ResourceManager::init();
     // Make sure we don't time out during slow operations at startup
-    deadlockWatchdog->updateHeartbeat();
+    updateHeartbeat();
 
     // Setup MessagesClient
     auto messagesClient = DependencyManager::get<MessagesClient>();
@@ -603,7 +657,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(clearDomainOctreeDetails()));
 
     // update our location every 5 seconds in the metaverse server, assuming that we are authenticated with one
-    const qint64 DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS = 5 * 1000;
+    const qint64 DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS = 5 * MSECS_PER_SEC;
 
     auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
     connect(&locationUpdateTimer, &QTimer::timeout, discoverabilityManager.data(), &DiscoverabilityManager::updateLocation);
@@ -625,7 +679,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     // connect to appropriate slots on AccountManager
     AccountManager& accountManager = AccountManager::getInstance();
 
-    const qint64 BALANCE_UPDATE_INTERVAL_MSECS = 5 * 1000;
+    const qint64 BALANCE_UPDATE_INTERVAL_MSECS = 5 * MSECS_PER_SEC;
 
     connect(&balanceUpdateTimer, &QTimer::timeout, &accountManager, &AccountManager::updateBalance);
     balanceUpdateTimer.start(BALANCE_UPDATE_INTERVAL_MSECS);
@@ -640,7 +694,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     accountManager.setIsAgent(true);
     accountManager.setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL);
 
-    UserActivityLogger::getInstance().launch(applicationVersion());
+    // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value.
+    // The value will be 0 if the user blew away settings this session, which is both a feature and a bug.
+    UserActivityLogger::getInstance().launch(applicationVersion(), _previousSessionCrashed, sessionRunTime.get());
 
     // once the event loop has started, check and signal for an access token
     QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection);
@@ -698,6 +754,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     ResourceCache::setRequestLimit(3);
 
     _glWidget = new GLCanvas();
+    getApplicationCompositor().setRenderingWidget(_glWidget);
     _window->setCentralWidget(_glWidget);
 
     _window->restoreGeometry();
@@ -731,7 +788,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     initializeGL();
     _offscreenContext->makeCurrent();
     // Make sure we don't time out during slow operations at startup
-    deadlockWatchdog->updateHeartbeat();
+    updateHeartbeat();
 
     // Tell our entity edit sender about our known jurisdictions
     _entityEditSender.setServerJurisdictions(&_entityServerJurisdictions);
@@ -743,7 +800,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
 
     _overlays.init(); // do this before scripts load
     // Make sure we don't time out during slow operations at startup
-    deadlockWatchdog->updateHeartbeat();
+    updateHeartbeat();
 
     connect(this, SIGNAL(aboutToQuit()), this, SLOT(aboutToQuit()));
 
@@ -754,7 +811,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     connect(&nodeList->getPacketReceiver(), &PacketReceiver::dataReceived,
         bandwidthRecorder.data(), &BandwidthRecorder::updateInboundData);
 
-    connect(&getMyAvatar()->getSkeletonModel(), &SkeletonModel::skeletonLoaded,
+    // FIXME -- I'm a little concerned about this.
+    connect(getMyAvatar()->getSkeletonModel().get(), &SkeletonModel::skeletonLoaded,
         this, &Application::checkSkeleton, Qt::QueuedConnection);
 
     // Setup the userInputMapper with the actions
@@ -872,7 +930,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     _applicationStateDevice = std::make_shared<controller::StateController>();
 
     _applicationStateDevice->addInputVariant(QString("InHMD"), controller::StateController::ReadLambda([]() -> float {
-        return (float)qApp->getAvatarUpdater()->isHMDMode();
+        return (float)qApp->isHMDMode();
     }));
     _applicationStateDevice->addInputVariant(QString("SnapTurn"), controller::StateController::ReadLambda([]() -> float {
         return (float)qApp->getMyAvatar()->getSnapTurn();
@@ -896,11 +954,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     // do this as late as possible so that all required subsystems are initialized
     scriptEngines->loadScripts();
     // Make sure we don't time out during slow operations at startup
-    deadlockWatchdog->updateHeartbeat();
+    updateHeartbeat();
 
     loadSettings();
     // Make sure we don't time out during slow operations at startup
-    deadlockWatchdog->updateHeartbeat();
+    updateHeartbeat();
 
     int SAVE_SETTINGS_INTERVAL = 10 * MSECS_PER_SECOND; // Let's save every seconds for now
     connect(&_settingsTimer, &QTimer::timeout, this, &Application::saveSettings);
@@ -1015,7 +1073,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     });
 
     // Make sure we don't time out during slow operations at startup
-    deadlockWatchdog->updateHeartbeat();
+    updateHeartbeat();
 
     connect(this, &Application::applicationStateChanged, this, &Application::activeChanged);
     qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)startupTimer.elapsed() / 1000.0);
@@ -1056,9 +1114,21 @@ void Application::showCursor(const QCursor& cursor) {
     _cursorNeedsChanging = true;
 }
 
+void Application::updateHeartbeat() {
+    static_cast<DeadlockWatchdogThread*>(_deadlockWatchdogThread)->updateHeartbeat();
+}
+
 void Application::aboutToQuit() {
     emit beforeAboutToQuit();
 
+    foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
+        QString name = inputPlugin->getName();
+        QAction* action = Menu::getInstance()->getActionForOption(name);
+        if (action->isChecked()) {
+            inputPlugin->deactivate();
+        }
+    }
+
     getActiveDisplayPlugin()->deactivate();
 
     _aboutToQuit = true;
@@ -1103,7 +1173,6 @@ void Application::cleanupBeforeQuit() {
 
     // first stop all timers directly or by invokeMethod
     // depending on what thread they run in
-    _avatarUpdate->terminate();
     locationUpdateTimer.stop();
     balanceUpdateTimer.stop();
     identityPacketTimer.stop();
@@ -1148,14 +1217,6 @@ Application::~Application() {
 
     ModelEntityItem::cleanupLoadedAnimations();
 
-    foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
-        QString name = inputPlugin->getName();
-        QAction* action = Menu::getInstance()->getActionForOption(name);
-        if (action->isChecked()) {
-            inputPlugin->deactivate();
-        }
-    }
-
     // remove avatars from physics engine
     DependencyManager::get<AvatarManager>()->clearOtherAvatars();
     VectorOfMotionStates motionStates;
@@ -1295,6 +1356,7 @@ void Application::initializeUi() {
     rootContext->setContextProperty("Quat", new Quat());
     rootContext->setContextProperty("Vec3", new Vec3());
     rootContext->setContextProperty("Uuid", new ScriptUUID());
+    rootContext->setContextProperty("Assets", new AssetMappingsScriptingInterface());
 
     rootContext->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
 
@@ -1371,6 +1433,17 @@ void Application::initializeUi() {
 
 void Application::paintGL() {
 
+    updateHeartbeat();
+
+    // Some plugins process message events, potentially leading to
+    // re-entering a paint event.  don't allow further processing if this
+    // happens
+    if (_inPaint) {
+        return;
+    }
+    _inPaint = true;
+    Finally clearFlagLambda([this] { _inPaint = false; });
+
     // paintGL uses a queued connection, so we can get messages from the queue even after we've quit
     // and the plugins have shutdown
     if (_aboutToQuit) {
@@ -1396,26 +1469,19 @@ void Application::paintGL() {
         _lastFramesPerSecondUpdate = now;
     }
 
-    PROFILE_RANGE(__FUNCTION__);
+    PROFILE_RANGE_EX(__FUNCTION__, 0xff0000ff, (uint64_t)_frameCount);
     PerformanceTimer perfTimer("paintGL");
 
     if (nullptr == _displayPlugin) {
         return;
     }
 
-    // Some plugins process message events, potentially leading to
-    // re-entering a paint event.  don't allow further processing if this
-    // happens
-    if (_inPaint) {
-        return;
-    }
-    _inPaint = true;
-    Finally clearFlagLambda([this] { _inPaint = false; });
-
     auto displayPlugin = getActiveDisplayPlugin();
     // FIXME not needed anymore?
     _offscreenContext->makeCurrent();
 
+    displayPlugin->updateHeadPose(_frameCount);
+
     // update the avatar with a fresh HMD pose
     getMyAvatar()->updateFromHMDSensorMatrix(getHMDSensorPose());
 
@@ -1473,7 +1539,6 @@ void Application::paintGL() {
         auto myAvatar = getMyAvatar();
         boomOffset = myAvatar->getScale() * myAvatar->getBoomLength() * -IDENTITY_FRONT;
 
-        myAvatar->startCapture();
         if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON || _myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
             Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN);
             Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, !(myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN));
@@ -1561,7 +1626,6 @@ void Application::paintGL() {
         if (!isHMDMode()) {
             _myCamera.update(1.0f / _fps);
         }
-        myAvatar->endCapture();
     }
 
     getApplicationCompositor().setFrameInfo(_frameCount, _myCamera.getTransform());
@@ -1596,12 +1660,7 @@ void Application::paintGL() {
             auto baseProjection = renderArgs._viewFrustum->getProjection();
             auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
             float IPDScale = hmdInterface->getIPDScale();
-
-            // Tell the plugin what pose we're using to render.  In this case we're just using the
-            // unmodified head pose because the only plugin that cares (the Oculus plugin) uses it
-            // for rotational timewarp.  If we move to support positonal timewarp, we need to
-            // ensure this contains the full pose composed with the eye offsets.
-            mat4 headPose = displayPlugin->getHeadPose(_frameCount);
+            mat4 headPose = displayPlugin->getHeadPose();
 
             // FIXME we probably don't need to set the projection matrix every frame,
             // only when the display plugin changes (or in non-HMD modes when the user
@@ -1618,6 +1677,10 @@ void Application::paintGL() {
                 mat4 eyeOffsetTransform = glm::translate(mat4(), eyeOffset * -1.0f * IPDScale);
                 eyeOffsets[eye] = eyeOffsetTransform;
 
+                // Tell the plugin what pose we're using to render.  In this case we're just using the
+                // unmodified head pose because the only plugin that cares (the Oculus plugin) uses it
+                // for rotational timewarp.  If we move to support positonal timewarp, we need to
+                // ensure this contains the full pose composed with the eye offsets.
                 displayPlugin->setEyeRenderPose(_frameCount, eye, headPose * glm::inverse(eyeOffsetTransform));
 
                 eyeProjections[eye] = displayPlugin->getEyeProjection(eye, baseProjection);
@@ -1743,6 +1806,11 @@ bool Application::importSVOFromURL(const QString& urlString) {
 }
 
 bool Application::event(QEvent* event) {
+
+    if (!Menu::getInstance()) {
+        return false;
+    }
+
     if ((int)event->type() == (int)Lambda) {
         ((LambdaEvent*)event)->call();
         return true;
@@ -1898,6 +1966,28 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 }
                 break;
 
+            case Qt::Key_1:
+            case Qt::Key_2:
+            case Qt::Key_3:
+            case Qt::Key_4:
+            case Qt::Key_5:
+            case Qt::Key_6:
+            case Qt::Key_7:
+                if (isMeta || isOption) {
+                    unsigned int index = static_cast<unsigned int>(event->key() - Qt::Key_1);
+                    auto displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
+                    if (index < displayPlugins.size()) {
+                        auto targetPlugin = displayPlugins.at(index);
+                        QString targetName = targetPlugin->getName();
+                        auto menu = Menu::getInstance();
+                        QAction* action = menu->getActionForOption(targetName);
+                        if (action && !action->isChecked()) {
+                            action->trigger();
+                        }
+                    }
+                }
+                break;
+
             case Qt::Key_X:
                 if (isShifted && isMeta) {
                     auto offscreenUi = DependencyManager::get<OffscreenUi>();
@@ -2466,11 +2556,12 @@ static uint32_t _renderedFrameIndex { INVALID_FRAME };
 
 void Application::idle(uint64_t now) {
 
-    if (_aboutToQuit) {
+    updateHeartbeat();
+
+    if (_aboutToQuit || _inPaint) {
         return; // bail early, nothing to do here.
     }
 
-
     checkChangeCursor();
 
     Stats::getInstance()->updateStats();
@@ -2519,11 +2610,12 @@ void Application::idle(uint64_t now) {
         return;
     }
 
+    PROFILE_RANGE(__FUNCTION__);
+
     // We're going to execute idle processing, so restart the last idle timer
     _lastTimeUpdated.start();
 
     {
-        PROFILE_RANGE(__FUNCTION__);
         static uint64_t lastIdleStart{ now };
         uint64_t idleStartToStartDuration = now - lastIdleStart;
         if (idleStartToStartDuration != 0) {
@@ -2775,6 +2867,7 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa
 
 void Application::loadSettings() {
 
+    sessionRunTime.set(0); // Just clean living. We're about to saveSettings, which will update value.
     DependencyManager::get<AudioClient>()->loadSettings();
     DependencyManager::get<LODManager>()->loadSettings();
 
@@ -2788,6 +2881,7 @@ void Application::loadSettings() {
 }
 
 void Application::saveSettings() {
+    sessionRunTime.set(_sessionRunTimer.elapsed() / MSECS_PER_SEC);
     DependencyManager::get<AudioClient>()->saveSettings();
     DependencyManager::get<LODManager>()->saveSettings();
 
@@ -2879,37 +2973,6 @@ void Application::init() {
     // Make sure any new sounds are loaded as soon as know about them.
     connect(tree.get(), &EntityTree::newCollisionSoundURL, DependencyManager::get<SoundCache>().data(), &SoundCache::getSound);
     connect(getMyAvatar(), &MyAvatar::newCollisionSoundURL, DependencyManager::get<SoundCache>().data(), &SoundCache::getSound);
-
-    setAvatarUpdateThreading();
-}
-
-const bool ENABLE_AVATAR_UPDATE_THREADING = false;
-void Application::setAvatarUpdateThreading() {
-    setAvatarUpdateThreading(ENABLE_AVATAR_UPDATE_THREADING);
-}
-void Application::setRawAvatarUpdateThreading() {
-    setRawAvatarUpdateThreading(ENABLE_AVATAR_UPDATE_THREADING);
-}
-void Application::setRawAvatarUpdateThreading(bool isThreaded) {
-    if (_avatarUpdate) {
-        if (_avatarUpdate->isThreaded() == isThreaded) {
-            return;
-        }
-        _avatarUpdate->terminate();
-    }
-    _avatarUpdate = new AvatarUpdate();
-    _avatarUpdate->initialize(isThreaded);
-}
-void Application::setAvatarUpdateThreading(bool isThreaded) {
-    if (_avatarUpdate && (_avatarUpdate->isThreaded() == isThreaded)) {
-        return;
-    }
-
-    if (_avatarUpdate) {
-        _avatarUpdate->terminate(); // Must be before we shutdown anim graph.
-    }
-    _avatarUpdate = new AvatarUpdate();
-    _avatarUpdate->initialize(isThreaded);
 }
 
 void Application::updateLOD() {
@@ -2937,7 +3000,7 @@ void Application::updateMyAvatarLookAtPosition() {
     auto eyeTracker = DependencyManager::get<EyeTracker>();
 
     bool isLookingAtSomeone = false;
-    bool isHMD = _avatarUpdate->isHMDMode();
+    bool isHMD = qApp->isHMDMode();
     glm::vec3 lookAtSpot;
     if (eyeTracker->isTracking() && (isHMD || eyeTracker->isSimulating())) {
         //  Look at the point that the user is looking at.
@@ -2946,7 +3009,7 @@ void Application::updateMyAvatarLookAtPosition() {
             lookAtPosition.x = -lookAtPosition.x;
         }
         if (isHMD) {
-            glm::mat4 headPose = getActiveDisplayPlugin()->getHeadPose(_frameCount);
+            glm::mat4 headPose = getActiveDisplayPlugin()->getHeadPose();
             glm::quat hmdRotation = glm::quat_cast(headPose);
             lookAtSpot = _myCamera.getPosition() + myAvatar->getOrientation() * (hmdRotation * lookAtPosition);
         } else {
@@ -2988,7 +3051,7 @@ void Application::updateMyAvatarLookAtPosition() {
         } else {
             //  I am not looking at anyone else, so just look forward
             if (isHMD) {
-                glm::mat4 headPose = _avatarUpdate->getHeadPose();
+                glm::mat4 headPose = myAvatar->getHMDSensorMatrix();
                 glm::quat headRotation = glm::quat_cast(headPose);
                 lookAtSpot = myAvatar->getPosition() +
                     myAvatar->getOrientation() * (headRotation * glm::vec3(0.0f, 0.0f, -TREE_SCALE));
@@ -3140,6 +3203,9 @@ void Application::updateDialogs(float deltaTime) {
 }
 
 void Application::update(float deltaTime) {
+
+    PROFILE_RANGE_EX(__FUNCTION__, 0xffff0000, (uint64_t)_frameCount + 1);
+
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
     PerformanceWarning warn(showWarnings, "Application::update()");
 
@@ -3230,16 +3296,23 @@ void Application::update(float deltaTime) {
     controller::Pose leftHandPose = userInputMapper->getPoseState(controller::Action::LEFT_HAND);
     controller::Pose rightHandPose = userInputMapper->getPoseState(controller::Action::RIGHT_HAND);
     auto myAvatarMatrix = createMatFromQuatAndPos(myAvatar->getOrientation(), myAvatar->getPosition());
-    myAvatar->setHandControllerPosesInWorldFrame(leftHandPose.transform(myAvatarMatrix), rightHandPose.transform(myAvatarMatrix));
+    auto worldToSensorMatrix = glm::inverse(myAvatar->getSensorToWorldMatrix());
+    auto avatarToSensorMatrix = worldToSensorMatrix * myAvatarMatrix;
+    myAvatar->setHandControllerPosesInSensorFrame(leftHandPose.transform(avatarToSensorMatrix), rightHandPose.transform(avatarToSensorMatrix));
 
     updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...
     updateDialogs(deltaTime); // update various stats dialogs if present
 
+    QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>();
+
     if (_physicsEnabled) {
+        PROFILE_RANGE_EX("Physics", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
+
         PerformanceTimer perfTimer("physics");
-        AvatarManager* avatarManager = DependencyManager::get<AvatarManager>().data();
 
         {
+            PROFILE_RANGE_EX("UpdateStats", 0xffffff00, (uint64_t)getActiveDisplayPlugin()->presentCount());
+
             PerformanceTimer perfTimer("updateStates)");
             static VectorOfMotionStates motionStates;
             _entitySimulation.getObjectsToRemoveFromPhysics(motionStates);
@@ -3272,12 +3345,14 @@ void Application::update(float deltaTime) {
             });
         }
         {
+            PROFILE_RANGE_EX("StepSimulation", 0xffff8000, (uint64_t)getActiveDisplayPlugin()->presentCount());
             PerformanceTimer perfTimer("stepSimulation");
             getEntities()->getTree()->withWriteLock([&] {
                 _physicsEngine->stepSimulation();
             });
         }
         {
+            PROFILE_RANGE_EX("HarvestChanges", 0xffffff00, (uint64_t)getActiveDisplayPlugin()->presentCount());
             PerformanceTimer perfTimer("havestChanges");
             if (_physicsEngine->hasOutgoingChanges()) {
                 getEntities()->getTree()->withWriteLock([&] {
@@ -3306,9 +3381,30 @@ void Application::update(float deltaTime) {
         }
     }
 
-    _avatarUpdate->synchronousProcess();
+    // AvatarManager update
+    {
+        PerformanceTimer perfTimer("AvatarManger");
+
+        qApp->setAvatarSimrateSample(1.0f / deltaTime);
+
+        {
+            PROFILE_RANGE_EX("OtherAvatars", 0xffff00ff, (uint64_t)getActiveDisplayPlugin()->presentCount());
+            avatarManager->updateOtherAvatars(deltaTime);
+        }
+
+        qApp->updateMyAvatarLookAtPosition();
+
+        // update sensorToWorldMatrix for camera and hand controllers
+        myAvatar->updateSensorToWorldMatrix();
+
+        {
+            PROFILE_RANGE_EX("MyAvatar", 0xffff00ff, (uint64_t)getActiveDisplayPlugin()->presentCount());
+            avatarManager->updateMyAvatar(deltaTime);
+        }
+    }
 
     {
+        PROFILE_RANGE_EX("Overlays", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
         PerformanceTimer perfTimer("overlays");
         _overlays.update(deltaTime);
     }
@@ -3328,6 +3424,7 @@ void Application::update(float deltaTime) {
 
     // Update my voxel servers with my current voxel query...
     {
+        PROFILE_RANGE_EX("QueryOctree", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
         PerformanceTimer perfTimer("queryOctree");
         quint64 sinceLastQuery = now - _lastQueriedTime;
         const quint64 TOO_LONG_SINCE_LAST_QUERY = 3 * USECS_PER_SECOND;
@@ -3364,9 +3461,6 @@ void Application::update(float deltaTime) {
             QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "sendDownstreamAudioStatsPacket", Qt::QueuedConnection);
         }
     }
-
-    // update sensorToWorldMatrix for rendering camera.
-    myAvatar->updateSensorToWorldMatrix();
 }
 
 
@@ -3803,9 +3897,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
     // FIXME: This preRender call is temporary until we create a separate render::scene for the mirror rendering.
     // Then we can move this logic into the Avatar::simulate call.
     auto myAvatar = getMyAvatar();
-    myAvatar->startRender();
     myAvatar->preRender(renderArgs);
-    myAvatar->endRender();
 
     // Update animation debug draw renderer
     AnimDebugDraw::getInstance().update();
@@ -3887,9 +3979,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
         _renderEngine->getRenderContext()->args = renderArgs;
 
         // Before the deferred pass, let's try to use the render engine
-        myAvatar->startRenderRun();
         _renderEngine->run();
-        myAvatar->endRenderRun();
     }
 
     activeRenderingThread = nullptr;
@@ -4018,9 +4108,6 @@ void Application::nodeAdded(SharedNodePointer node) {
     if (node->getType() == NodeType::AvatarMixer) {
         // new avatar mixer, send off our identity packet right away
         getMyAvatar()->sendIdentityPacket();
-    } else if (node->getType() == NodeType::AssetServer) {
-        // the addition of an asset-server always re-enables the upload to asset server menu option
-        Menu::getInstance()->getActionForOption(MenuOption::UploadAsset)->setEnabled(true);
     }
 }
 
@@ -4070,10 +4157,6 @@ void Application::nodeKilled(SharedNodePointer node) {
     } else if (node->getType() == NodeType::AvatarMixer) {
         // our avatar mixer has gone away - clear the hash of avatars
         DependencyManager::get<AvatarManager>()->clearOtherAvatars();
-    } else if (node->getType() == NodeType::AssetServer
-               && !DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::AssetServer)) {
-        // this was our last asset server - disable the menu option to upload an asset
-        Menu::getInstance()->getActionForOption(MenuOption::UploadAsset)->setEnabled(false);
     }
 }
 void Application::trackIncomingOctreePacket(ReceivedMessage& message, SharedNodePointer sendingNode, bool wasStatsPacket) {
@@ -4299,7 +4382,10 @@ bool Application::acceptURL(const QString& urlString, bool defaultUpload) {
         }
     }
 
-    return defaultUpload && askToUploadAsset(urlString);
+    if (defaultUpload) {
+        toggleAssetServerWidget(urlString);
+    }
+    return defaultUpload;
 }
 
 void Application::setSessionUUID(const QUuid& sessionUUID) {
@@ -4327,8 +4413,8 @@ bool Application::askToSetAvatarUrl(const QString& url) {
 
         case FSTReader::HEAD_AND_BODY_MODEL:
              ok = QMessageBox::Ok == OffscreenUi::question("Set Avatar",
-							   "Would you like to use '" + modelName + "' for your avatar?",
-							   QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
+                               "Would you like to use '" + modelName + "' for your avatar?",
+                               QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
         break;
 
         default:
@@ -4361,79 +4447,6 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
     return true;
 }
 
-bool Application::askToUploadAsset(const QString& filename) {
-    if (!DependencyManager::get<NodeList>()->getThisNodeCanRez()) {
-        OffscreenUi::warning(_window, "Failed Upload",
-                             QString("You don't have upload rights on that domain.\n\n"));
-        return false;
-    }
-
-    QUrl url { filename };
-    if (auto upload = DependencyManager::get<AssetClient>()->createUpload(url.toLocalFile())) {
-
-        QMessageBox messageBox;
-        messageBox.setWindowTitle("Asset upload");
-        messageBox.setText("You are about to upload the following file to the asset server:\n" +
-                           url.toDisplayString());
-        messageBox.setInformativeText("Do you want to continue?");
-        messageBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
-        messageBox.setDefaultButton(QMessageBox::Ok);
-
-        // Option to drop model in world for models
-        if (filename.endsWith(FBX_EXTENSION, Qt::CaseInsensitive) || filename.endsWith(OBJ_EXTENSION, Qt::CaseInsensitive)) {
-            auto checkBox = new QCheckBox(&messageBox);
-            checkBox->setText("Add to scene");
-            messageBox.setCheckBox(checkBox);
-        }
-
-        if (messageBox.exec() != QMessageBox::Ok) {
-            upload->deleteLater();
-            return false;
-        }
-
-        // connect to the finished signal so we know when the AssetUpload is done
-        if (messageBox.checkBox() && (messageBox.checkBox()->checkState() == Qt::Checked)) {
-            // Custom behavior for models
-            QObject::connect(upload, &AssetUpload::finished, this, &Application::modelUploadFinished);
-        } else {
-            QObject::connect(upload, &AssetUpload::finished,
-                             &AssetUploadDialogFactory::getInstance(),
-                             &AssetUploadDialogFactory::handleUploadFinished);
-        }
-
-        // start the upload now
-        upload->start();
-        return true;
-    }
-
-    // display a message box with the error
-    OffscreenUi::warning(_window, "Failed Upload", QString("Failed to upload %1.\n\n").arg(filename));
-    return false;
-}
-
-void Application::modelUploadFinished(AssetUpload* upload, const QString& hash) {
-    auto filename = QFileInfo(upload->getFilename()).fileName();
-
-    if ((upload->getError() == AssetUpload::NoError) &&
-        (FBX_EXTENSION.endsWith(upload->getExtension(), Qt::CaseInsensitive) ||
-         OBJ_EXTENSION.endsWith(upload->getExtension(), Qt::CaseInsensitive))) {
-
-        auto entities = DependencyManager::get<EntityScriptingInterface>();
-
-        EntityItemProperties properties;
-        properties.setType(EntityTypes::Model);
-        properties.setModelURL(QString("%1:%2.%3").arg(URL_SCHEME_ATP).arg(hash).arg(upload->getExtension()));
-        properties.setPosition(_myCamera.getPosition() + _myCamera.getOrientation() * Vectors::FRONT * 2.0f);
-        properties.setName(QUrl(upload->getFilename()).fileName());
-
-        entities->addEntity(properties);
-
-        upload->deleteLater();
-    } else {
-        AssetUploadDialogFactory::getInstance().handleUploadFinished(upload, hash);
-    }
-}
-
 bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
 
     QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
@@ -4533,6 +4546,22 @@ void Application::toggleRunningScriptsWidget() {
     //}
 }
 
+void Application::toggleAssetServerWidget(QString filePath) {
+    if (!DependencyManager::get<NodeList>()->getThisNodeCanRez()) {
+        return;
+    }
+
+    static const QUrl url { "AssetServer.qml" };
+
+    auto startUpload = [=](QQmlContext* context, QObject* newObject){
+        if (!filePath.isEmpty()) {
+            emit uploadRequest(filePath);
+        }
+    };
+    DependencyManager::get<OffscreenUi>()->show(url, "AssetServer", startUpload);
+    startUpload(nullptr, nullptr);
+}
+
 void Application::packageModel() {
     ModelPackager::package();
 }
@@ -4633,7 +4662,7 @@ void Application::notifyPacketVersionMismatch() {
 }
 
 void Application::checkSkeleton() {
-    if (getMyAvatar()->getSkeletonModel().isActive() && !getMyAvatar()->getSkeletonModel().hasSkeleton()) {
+    if (getMyAvatar()->getSkeletonModel()->isActive() && !getMyAvatar()->getSkeletonModel()->hasSkeleton()) {
         qCDebug(interfaceapp) << "MyAvatar model has no skeleton";
 
         QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded...";
@@ -4722,11 +4751,18 @@ qreal Application::getDevicePixelRatio() {
 }
 
 DisplayPlugin* Application::getActiveDisplayPlugin() {
-    if (nullptr == _displayPlugin) {
-        updateDisplayMode();
-        Q_ASSERT(_displayPlugin);
+    DisplayPlugin* result = nullptr;
+    if (QThread::currentThread() == thread()) {
+        if (nullptr == _displayPlugin) {
+            updateDisplayMode();
+            Q_ASSERT(_displayPlugin);
+        }
+        result = _displayPlugin.get();
+    } else {
+        std::unique_lock<std::mutex> lock(_displayPluginLock);
+        result = _displayPlugin.get();
     }
-    return _displayPlugin.get();
+    return result;
 }
 
 const DisplayPlugin* Application::getActiveDisplayPlugin() const {
@@ -4771,6 +4807,19 @@ static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool acti
 }
 
 void Application::updateDisplayMode() {
+    // Unsafe to call this method from anything but the main thread
+    if (QThread::currentThread() != thread()) {
+        qFatal("Attempted to switch display plugins from a non-main thread");
+    }
+
+    // Some plugins *cough* Oculus *cough* process message events from inside their
+    // display function, and we don't want to change the display plugin underneath
+    // the paintGL call, so we need to guard against that
+    // The current oculus runtime doesn't do this anymore
+    if (_inPaint) {
+        qFatal("Attempted to switch display plugins while in painting");
+    }
+
     auto menu = Menu::getInstance();
     auto displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
 
@@ -4827,70 +4876,31 @@ void Application::updateDisplayMode() {
         }
     }
 
+    if (newDisplayPlugin == _displayPlugin) {
+        return;
+    }
+
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    DisplayPluginPointer oldDisplayPlugin = _displayPlugin;
-    if (newDisplayPlugin == oldDisplayPlugin) {
-        return;
-    }
 
-    // Some plugins *cough* Oculus *cough* process message events from inside their
-    // display function, and we don't want to change the display plugin underneath
-    // the paintGL call, so we need to guard against that
-    if (_inPaint) {
-        qDebug() << "Deferring plugin switch until out of painting";
-        // Have the old plugin stop requesting renders
-        oldDisplayPlugin->stop();
-        QTimer* timer = new QTimer();
-        timer->singleShot(500, [this, timer] {
-            timer->deleteLater();
-            updateDisplayMode();
-        });
-        return;
-    }
+    // Make the switch atomic from the perspective of other threads
+    {
+        std::unique_lock<std::mutex> lock(_displayPluginLock);
 
-
-    if (!_pluginContainer->currentDisplayActions().isEmpty()) {
-        auto menu = Menu::getInstance();
-        foreach(auto itemInfo, _pluginContainer->currentDisplayActions()) {
-            menu->removeMenuItem(itemInfo.first, itemInfo.second);
+        if (_displayPlugin) {
+            _displayPlugin->deactivate();
         }
-        _pluginContainer->currentDisplayActions().clear();
-    }
 
-    if (newDisplayPlugin) {
+        // FIXME probably excessive and useless context switching
         _offscreenContext->makeCurrent();
         newDisplayPlugin->activate();
         _offscreenContext->makeCurrent();
         offscreenUi->resize(fromGlm(newDisplayPlugin->getRecommendedUiSize()));
         _offscreenContext->makeCurrent();
+        getApplicationCompositor().setDisplayPlugin(newDisplayPlugin);
+        _displayPlugin = newDisplayPlugin;
     }
 
-    oldDisplayPlugin = _displayPlugin;
-    _displayPlugin = newDisplayPlugin;
-    getApplicationCompositor().setDisplayPlugin(_displayPlugin);
 
-    // If the displayPlugin is a screen based HMD, then it will want the HMDTools displayed
-    // Direct Mode HMDs (like windows Oculus) will be isHmd() but will have a screen of -1
-    bool newPluginWantsHMDTools = newDisplayPlugin ?
-                                    (newDisplayPlugin->isHmd() && (newDisplayPlugin->getHmdScreen() >= 0)) : false;
-    bool oldPluginWantedHMDTools = oldDisplayPlugin ?
-                                    (oldDisplayPlugin->isHmd() && (oldDisplayPlugin->getHmdScreen() >= 0)) : false;
-
-    // Only show the hmd tools after the correct plugin has
-    // been activated so that it's UI is setup correctly
-    if (newPluginWantsHMDTools) {
-        _pluginContainer->showDisplayPluginsTools();
-    }
-
-    if (oldDisplayPlugin) {
-        oldDisplayPlugin->deactivate();
-        _offscreenContext->makeCurrent();
-
-        // if the old plugin was HMD and the new plugin is not HMD, then hide our hmdtools
-        if (oldPluginWantedHMDTools && !newPluginWantsHMDTools) {
-            DependencyManager::get<DialogsManager>()->hmdTools(false);
-        }
-    }
     emit activeDisplayPluginChanged();
 
     // reset the avatar, to set head and hand palms back to a resonable default pose.
@@ -4989,7 +4999,7 @@ mat4 Application::getEyeOffset(int eye) const {
 
 mat4 Application::getHMDSensorPose() const {
     if (isHMDMode()) {
-        return getActiveDisplayPlugin()->getHeadPose(_frameCount);
+        return getActiveDisplayPlugin()->getHeadPose();
     }
     return mat4();
 }

interface/src/Application.h

@@ -40,7 +40,6 @@
 #include <ViewFrustum.h>
 #include <AbstractUriHandler.h>
 
-#include "avatar/AvatarUpdate.h"
 #include "avatar/MyAvatar.h"
 #include "Bookmarks.h"
 #include "Camera.h"
@@ -215,7 +214,6 @@ public:
     const QRect& getMirrorViewRect() const { return _mirrorViewRect; }
 
     void updateMyAvatarLookAtPosition();
-    AvatarUpdate* getAvatarUpdater() { return _avatarUpdate; }
     float getAvatarSimrate();
     void setAvatarSimrateSample(float sample);
 
@@ -231,6 +229,8 @@ signals:
     void beforeAboutToQuit();
     void activeDisplayPluginChanged();
 
+    void uploadRequest(QString path);
+
 public slots:
     QVector<EntityItemID> pasteEntities(float x, float y, float z);
     bool exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs);
@@ -242,6 +242,7 @@ public slots:
     Q_INVOKABLE void loadScriptURLDialog();
     void toggleLogDialog();
     void toggleRunningScriptsWidget();
+    void toggleAssetServerWidget(QString filePath = "");
 
     void handleLocalServerConnection();
     void readArgumentsFromLocalSocket();
@@ -250,11 +251,6 @@ public slots:
 
     void openUrl(const QUrl& url);
 
-    void setAvatarUpdateThreading();
-    void setAvatarUpdateThreading(bool isThreaded);
-    void setRawAvatarUpdateThreading();
-    void setRawAvatarUpdateThreading(bool isThreaded);
-
     void resetSensors(bool andReload = false);
     void setActiveFaceTracker();
 
@@ -275,6 +271,8 @@ public slots:
 
     void reloadResourceCaches();
 
+    void updateHeartbeat();
+
     void crashApplication();
     void deadlockApplication();
 
@@ -303,8 +301,6 @@ private slots:
     bool acceptSnapshot(const QString& urlString);
     bool askToSetAvatarUrl(const QString& url);
     bool askToLoadScript(const QString& scriptFilenameOrURL);
-    bool askToUploadAsset(const QString& asset);
-    void modelUploadFinished(AssetUpload* upload, const QString& hash);
 
     bool askToWearAvatarAttachmentUrl(const QString& url);
     void displayAvatarAttachmentWarning(const QString& message) const;
@@ -380,17 +376,19 @@ private:
 
     void maybeToggleMenuVisible(QMouseEvent* event);
 
-    bool _dependencyManagerIsSetup;
+    MainWindow* _window;
+    QElapsedTimer& _sessionRunTimer;
+
+    bool _previousSessionCrashed;
 
     OffscreenGLCanvas* _offscreenContext { nullptr };
     DisplayPluginPointer _displayPlugin;
+    std::mutex _displayPluginLock;
     InputPluginList _activeInputPlugins;
 
     bool _activatingDisplayPlugin { false };
     QMap<gpu::TexturePointer, gpu::FramebufferPointer> _lockedFramebufferMap;
 
-    MainWindow* _window;
-
     QUndoStack _undoStack;
     UndoStackScriptingInterface _undoStackScriptingInterface;
 
@@ -418,7 +416,6 @@ private:
 
     std::shared_ptr<controller::StateController> _applicationStateDevice; // Default ApplicationDevice reflecting the state of different properties of the session
     std::shared_ptr<KeyboardMouseDevice> _keyboardMouseDevice;   // Default input device, the good old keyboard mouse and maybe touchpad
-    AvatarUpdate* _avatarUpdate {nullptr};
     SimpleMovingAverage _avatarSimsPerSecond {10};
     int _avatarSimsPerSecondReport {0};
     quint64 _lastAvatarSimsPerSecondUpdate {0};
@@ -511,6 +508,8 @@ private:
     mutable QMutex _changeCursorLock { QMutex::Recursive };
     QCursor _desiredCursor{ Qt::BlankCursor };
     bool _cursorNeedsChanging { false };
+
+    QThread* _deadlockWatchdogThread;
 };
 
 #endif // hifi_Application_h

interface/src/CrashHandler.cpp

@@ -27,7 +27,7 @@
 
 static const QString RUNNING_MARKER_FILENAME = "Interface.running";
 
-void CrashHandler::checkForAndHandleCrash() {
+bool CrashHandler::checkForAndHandleCrash() {
     QFile runningMarkerFile(runningMarkerFilePath());
     if (runningMarkerFile.exists()) {
         QSettings::setDefaultFormat(QSettings::IniFormat);
@@ -42,7 +42,9 @@ void CrashHandler::checkForAndHandleCrash() {
                 handleCrash(action);
             }
         }
+        return true;
     }
+    return false;
 }
 
 CrashHandler::Action CrashHandler::promptUserForAction() {

interface/src/CrashHandler.h

@@ -17,7 +17,7 @@
 class CrashHandler {
 
 public:
-    static void checkForAndHandleCrash();
+    static bool checkForAndHandleCrash();
 
     static void writeRunningMarkerFiler();
     static void deleteRunningMarkerFile();

interface/src/FileLogger.h

@@ -22,6 +22,7 @@ public:
     FileLogger(QObject* parent = NULL);
     virtual ~FileLogger();
 
+    QString getFilename() { return _fileName; }
     virtual void addMessage(const QString&) override;
     virtual QString getLogData() override;
     virtual void locateLog() override;

interface/src/Menu.cpp

@@ -35,7 +35,6 @@
 #include "MainWindow.h"
 #include "render/DrawStatus.h"
 #include "scripting/MenuScriptingInterface.h"
-#include "ui/AssetUploadDialogFactory.h"
 #include "ui/DialogsManager.h"
 #include "ui/StandAloneJSConsole.h"
 #include "InterfaceLogging.h"
@@ -47,7 +46,7 @@
 #include "Menu.h"
 
 Menu* Menu::getInstance() {
-    return static_cast<Menu*>(qApp->getWindow()->menuBar());
+    return dynamic_cast<Menu*>(qApp->getWindow()->menuBar());
 }
 
 Menu::Menu() {
@@ -92,7 +91,7 @@ Menu::Menu() {
     redoAction->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_Z);
     addActionToQMenuAndActionHash(editMenu, redoAction);
 
-    // Edit > Running Sccripts
+    // Edit > Running Scripts
     addActionToQMenuAndActionHash(editMenu, MenuOption::RunningScripts, Qt::CTRL | Qt::Key_J,
         qApp, SLOT(toggleRunningScriptsWidget()));
 
@@ -108,7 +107,7 @@ Menu::Menu() {
 
     auto scriptEngines = DependencyManager::get<ScriptEngines>();
     // Edit > Stop All Scripts... [advanced]
-    addActionToQMenuAndActionHash(editMenu, MenuOption::StopAllScripts, 0, 
+    addActionToQMenuAndActionHash(editMenu, MenuOption::StopAllScripts, 0,
         scriptEngines.data(), SLOT(stopAllScripts()),
         QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");
 
@@ -128,6 +127,16 @@ Menu::Menu() {
         SLOT(toggleConsole()),
         QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");
 
+    editMenu->addSeparator();
+
+    // Edit > My Asset Server
+    auto assetServerAction = addActionToQMenuAndActionHash(editMenu, MenuOption::AssetServer,
+                                                           Qt::CTRL | Qt::SHIFT | Qt::Key_A,
+                                                           qApp, SLOT(toggleAssetServerWidget()));
+    auto nodeList = DependencyManager::get<NodeList>();
+    QObject::connect(nodeList.data(), &NodeList::canRezChanged, assetServerAction, &QAction::setEnabled);
+    assetServerAction->setEnabled(nodeList->getThisNodeCanRez());
+
     // Edit > Reload All Content [advanced]
     addActionToQMenuAndActionHash(editMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()),
         QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");
@@ -144,7 +153,7 @@ Menu::Menu() {
     auto audioIO = DependencyManager::get<AudioClient>();
 
     // Audio > Mute
-    addCheckableActionToQMenuAndActionHash(audioMenu, MenuOption::MuteAudio, Qt::CTRL | Qt::Key_M, false, 
+    addCheckableActionToQMenuAndActionHash(audioMenu, MenuOption::MuteAudio, Qt::CTRL | Qt::Key_M, false,
         audioIO.data(), SLOT(toggleMute()));
 
     // Audio > Show Level Meter
@@ -354,17 +363,6 @@ Menu::Menu() {
 
     // Developer > Assets >>>
     MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets");
-    auto& assetDialogFactory = AssetUploadDialogFactory::getInstance();
-    assetDialogFactory.setDialogParent(this);
-    QAction* assetUpload = addActionToQMenuAndActionHash(assetDeveloperMenu,
-        MenuOption::UploadAsset,
-        0,
-        &assetDialogFactory,
-        SLOT(showDialog()));
-
-    // disable the asset upload action by default - it gets enabled only if asset server becomes present
-    assetUpload->setEnabled(false);
-
     auto& atpMigrator = ATPAssetMigrator::getInstance();
     atpMigrator.setDialogParent(this);
 
@@ -460,7 +458,7 @@ Menu::Menu() {
         avatar, SLOT(setEnableMeshVisible(bool)));
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisableEyelidAdjustment, 0, false);
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::TurnWithHead, 0, false);
-    addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::UseAnimPreAndPostRotations, 0, false,
+    addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::UseAnimPreAndPostRotations, 0, true,
         avatar, SLOT(setUseAnimPreAndPostRotations(bool)));
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableInverseKinematics, 0, true,
         avatar, SLOT(setEnableInverseKinematics(bool)));
@@ -536,7 +534,7 @@ Menu::Menu() {
 
     // Developer > Audio >>>
     MenuWrapper* audioDebugMenu = developerMenu->addMenu("Audio");
-    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction, 0, true, 
+    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction, 0, true,
         audioIO.data(), SLOT(toggleAudioNoiseReduction()));
     addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::EchoServerAudio, 0, false,
         audioIO.data(), SLOT(toggleServerEcho()));
@@ -619,7 +617,7 @@ Menu::Menu() {
                                   QAction::NoRole, UNSPECIFIED_POSITION, "Advanced");
 
 
-    addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::NamesAboveHeads, 0, true, 
+    addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::NamesAboveHeads, 0, true,
                 NULL, NULL, UNSPECIFIED_POSITION, "Advanced");
 #endif
 }
@@ -653,7 +651,7 @@ void Menu::addMenuItem(const MenuItemProperties& properties) {
         } else if (properties.isCheckable) {
             menuItemAction = addCheckableActionToQMenuAndActionHash(menuObj, properties.menuItemName,
                                                                     properties.shortcutKeySequence, properties.isChecked,
-                                                                    MenuScriptingInterface::getInstance(), SLOT(menuItemTriggered()), 
+                                                                    MenuScriptingInterface::getInstance(), SLOT(menuItemTriggered()),
                                                                     requestedPosition, properties.grouping);
         } else {
             menuItemAction = addActionToQMenuAndActionHash(menuObj, properties.menuItemName, properties.shortcutKeySequence,

interface/src/Menu.h

@@ -34,6 +34,7 @@ namespace MenuOption {
     const QString AnimDebugDrawDefaultPose = "Debug Draw Default Pose";
     const QString AnimDebugDrawPosition= "Debug Draw Position";
     const QString AssetMigration = "ATP Asset Migration";
+    const QString AssetServer = "My Asset Server";
     const QString Attachments = "Attachments...";
     const QString AudioNetworkStats = "Audio Network Stats";
     const QString AudioNoiseReduction = "Audio Noise Reduction";
@@ -84,7 +85,6 @@ namespace MenuOption {
     const QString DontRenderEntitiesAsScene = "Don't Render Entities as Scene";
     const QString EchoLocalAudio = "Echo Local Audio";
     const QString EchoServerAudio = "Echo Server Audio";
-    const QString Enable3DTVMode = "Enable 3DTV Mode";
     const QString EnableCharacterController = "Enable avatar collisions";
     const QString EnableInverseKinematics = "Enable Inverse Kinematics";
     const QString ExpandMyAvatarSimulateTiming = "Expand /myAvatar/simulation";
@@ -168,7 +168,6 @@ namespace MenuOption {
     const QString ToolWindow = "Tool Window";
     const QString TransmitterDrive = "Transmitter Drive";
     const QString TurnWithHead = "Turn using Head";
-    const QString UploadAsset = "Upload File to Asset Server";
     const QString UseAudioForMouth = "Use Audio for Mouth";
     const QString UseCamera = "Use Camera";
     const QString UseAnimPreAndPostRotations = "Use Anim Pre and Post Rotations";

interface/src/PluginContainerProxy.cpp

@@ -38,8 +38,8 @@ void PluginContainerProxy::requestReset() {
     qApp->resetSensors(true);
 }
 
-void PluginContainerProxy::showDisplayPluginsTools() {
-    DependencyManager::get<DialogsManager>()->hmdTools(true);
+void PluginContainerProxy::showDisplayPluginsTools(bool show) {
+    DependencyManager::get<DialogsManager>()->hmdTools(show);
 }
 
 GLWidget* PluginContainerProxy::getPrimaryWidget() {

interface/src/PluginContainerProxy.h

@@ -14,7 +14,7 @@ class PluginContainerProxy : public QObject, PluginContainer {
     Q_OBJECT
     PluginContainerProxy();
     virtual ~PluginContainerProxy();
-    virtual void showDisplayPluginsTools() override;
+    virtual void showDisplayPluginsTools(bool show = true) override;
     virtual void requestReset() override;
     virtual bool makeRenderingContextCurrent() override;
     virtual void releaseSceneTexture(const gpu::TexturePointer& texture) override;

interface/src/assets/ATPAssetMigrator.cpp

@@ -24,9 +24,9 @@
 #include <AssetClient.h>
 #include <AssetUpload.h>
 #include <ResourceManager.h>
+#include <MappingRequest.h>
 
 #include "OffscreenUi.h"
-#include "../ui/AssetUploadDialogFactory.h"
 
 Q_DECLARE_LOGGING_CATEGORY(asset_migrator);
 Q_LOGGING_CATEGORY(asset_migrator, "hf.asset_migrator");
@@ -38,18 +38,18 @@ ATPAssetMigrator& ATPAssetMigrator::getInstance() {
 
 static const QString ENTITIES_OBJECT_KEY = "Entities";
 static const QString MODEL_URL_KEY = "modelURL";
+static const QString COMPOUND_SHAPE_URL_KEY = "compoundShapeURL";
 static const QString MESSAGE_BOX_TITLE = "ATP Asset Migration";
 
 void ATPAssetMigrator::loadEntityServerFile() {
-    auto filename = QFileDialog::getOpenFileName(_dialogParent, "Select an entity-server content file to migrate",
-                                                 QString(), QString("Entity-Server Content (*.gz)"));
+    auto filename = OffscreenUi::getOpenFileName(_dialogParent, tr("Select an entity-server content file to migrate"), QString(), tr("Entity-Server Content (*.gz)"));
     
     if (!filename.isEmpty()) {
         qCDebug(asset_migrator) << "Selected filename for ATP asset migration: " << filename;
         
         static const QString MIGRATION_CONFIRMATION_TEXT {
-            "The ATP Asset Migration process will scan the selected entity-server file, upload discovered resources to the"\
-            " current asset-server and then save a new entity-server file with the ATP URLs.\n\nAre you ready to"\
+            "The ATP Asset Migration process will scan the selected entity-server file,\nupload discovered resources to the"\
+            " current asset-server\nand then save a new entity-server file with the ATP URLs.\n\nAre you ready to"\
             " continue?\n\nMake sure you are connected to the right domain."
         };
         
@@ -77,57 +77,75 @@ void ATPAssetMigrator::loadEntityServerFile() {
             for (auto jsonValue : _entitiesArray) {
                 QJsonObject entityObject = jsonValue.toObject();
                 QString modelURLString = entityObject.value(MODEL_URL_KEY).toString();
-                
-                if (!modelURLString.isEmpty()) {
-                    QUrl modelURL = QUrl(modelURLString);
-                    
-                    if (!_ignoredUrls.contains(modelURL)
-                        && (modelURL.scheme() == URL_SCHEME_HTTP || modelURL.scheme() == URL_SCHEME_HTTPS
-                            || modelURL.scheme() == URL_SCHEME_FILE || modelURL.scheme() == URL_SCHEME_FTP)) {
-                        
-                        if (_pendingReplacements.contains(modelURL)) {
-                            // we already have a request out for this asset, just store the QJsonValueRef
-                            // so we can do the hash replacement when the request comes back
-                            _pendingReplacements.insert(modelURL, jsonValue);
-                        } else if (_uploadedAssets.contains(modelURL)) {
-                            // we already have a hash for this asset
-                            // so just do the replacement immediately
-                            entityObject[MODEL_URL_KEY] = _uploadedAssets.value(modelURL).toString();
-                            jsonValue = entityObject;
-                        } else if (wantsToMigrateResource(modelURL)) {
-                            auto request = ResourceManager::createResourceRequest(this, modelURL);
-                            
-                            if (request) {
-                                qCDebug(asset_migrator) << "Requesting" << modelURL << "for ATP asset migration";
-                                
-                                // add this combination of QUrl and QJsonValueRef to our multi hash so we can change the URL
-                                // to an ATP one once ready
-                                _pendingReplacements.insert(modelURL, jsonValue);
-                                
-                                connect(request, &ResourceRequest::finished, this, [=]() {
-                                    if (request->getResult() == ResourceRequest::Success) {
-                                        migrateResource(request);
+                QString compoundURLString = entityObject.value(COMPOUND_SHAPE_URL_KEY).toString();
+
+                for (int i = 0; i < 2; ++i) {
+                    bool isModelURL = (i == 0);
+                    quint8 replacementType = i;
+                    auto migrationURLString = (isModelURL) ? modelURLString : compoundURLString;
+
+                    if (!migrationURLString.isEmpty()) {
+                        QUrl migrationURL = QUrl(migrationURLString);
+
+                        if (!_ignoredUrls.contains(migrationURL)
+                            && (migrationURL.scheme() == URL_SCHEME_HTTP || migrationURL.scheme() == URL_SCHEME_HTTPS
+                                || migrationURL.scheme() == URL_SCHEME_FILE || migrationURL.scheme() == URL_SCHEME_FTP)) {
+
+                                if (_pendingReplacements.contains(migrationURL)) {
+                                    // we already have a request out for this asset, just store the QJsonValueRef
+                                    // so we can do the hash replacement when the request comes back
+                                    _pendingReplacements.insert(migrationURL, { jsonValue, replacementType });
+                                } else if (_uploadedAssets.contains(migrationURL)) {
+                                    // we already have a hash for this asset
+                                    // so just do the replacement immediately
+                                    if (isModelURL) {
+                                        entityObject[MODEL_URL_KEY] = _uploadedAssets.value(migrationURL).toString();
                                     } else {
-                                        OffscreenUi::warning(_dialogParent, "Error",
-                                                             QString("Could not retrieve asset at %1").arg(modelURL.toString()));
+                                        entityObject[COMPOUND_SHAPE_URL_KEY] = _uploadedAssets.value(migrationURL).toString();
                                     }
-                                    request->deleteLater();
-                                });
-                                
-                                request->send();
-                            } else {
-                                OffscreenUi::warning(_dialogParent, "Error",
-                                                     QString("Could not create request for asset at %1").arg(modelURL.toString()));
+
+                                    jsonValue = entityObject;
+                                } else if (wantsToMigrateResource(migrationURL)) {
+                                    auto request = ResourceManager::createResourceRequest(this, migrationURL);
+
+                                    if (request) {
+                                        qCDebug(asset_migrator) << "Requesting" << migrationURL << "for ATP asset migration";
+
+                                        // add this combination of QUrl and QJsonValueRef to our multi hash so we can change the URL
+                                        // to an ATP one once ready
+                                        _pendingReplacements.insert(migrationURL, { jsonValue, (isModelURL ? 0 : 1)});
+
+                                        connect(request, &ResourceRequest::finished, this, [=]() {
+                                            if (request->getResult() == ResourceRequest::Success) {
+                                                migrateResource(request);
+                                            } else {
+                                                ++_errorCount;
+                                                _pendingReplacements.remove(migrationURL);
+                                                qWarning() << "Could not retrieve asset at" << migrationURL.toString();
+
+                                                checkIfFinished();
+                                            }
+                                            request->deleteLater();
+                                        });
+
+                                        request->send();
+                                    } else {
+                                        ++_errorCount;
+                                        qWarning() << "Count not create request for asset at" << migrationURL.toString();
+                                    }
+                                    
+                                } else {
+                                    _ignoredUrls.insert(migrationURL);
+                                }
                             }
-                            
-                        } else {
-                            _ignoredUrls.insert(modelURL);
-                        }
                     }
                 }
+
             }
             
             _doneReading = true;
+
+            checkIfFinished();
             
         } else {
             OffscreenUi::warning(_dialogParent, "Error",
@@ -140,76 +158,109 @@ void ATPAssetMigrator::migrateResource(ResourceRequest* request) {
     // use an asset client to upload the asset
     auto assetClient = DependencyManager::get<AssetClient>();
     
-    QFileInfo assetInfo { request->getUrl().fileName() };
-    
-    auto upload = assetClient->createUpload(request->getData(), assetInfo.completeSuffix());
-    
-    if (upload) {
-        // add this URL to our hash of AssetUpload to original URL
-        _originalURLs.insert(upload, request->getUrl());
-        
-        qCDebug(asset_migrator) << "Starting upload of asset from" << request->getUrl();
-        
-        // connect to the finished signal so we know when the AssetUpload is done
-        QObject::connect(upload, &AssetUpload::finished, this, &ATPAssetMigrator::assetUploadFinished);
-        
-        // start the upload now
-        upload->start();
-    } else {
-        // show a QMessageBox to say that there is no local asset server
-        QString messageBoxText = QString("Could not upload \n\n%1\n\nbecause you are currently not connected" \
-                                         " to a local asset-server.").arg(assetInfo.fileName());
-        
-        QMessageBox::information(_dialogParent, "Failed to Upload", messageBoxText);
-    }
+    auto upload = assetClient->createUpload(request->getData());
+
+    // add this URL to our hash of AssetUpload to original URL
+    _originalURLs.insert(upload, request->getUrl());
+
+    qCDebug(asset_migrator) << "Starting upload of asset from" << request->getUrl();
+
+    // connect to the finished signal so we know when the AssetUpload is done
+    QObject::connect(upload, &AssetUpload::finished, this, &ATPAssetMigrator::assetUploadFinished);
+
+    // start the upload now
+    upload->start();
 }
 
 void ATPAssetMigrator::assetUploadFinished(AssetUpload *upload, const QString& hash) {
+    // remove this migrationURL from the key for the AssetUpload pointer
+    auto migrationURL = _originalURLs.take(upload);
+
     if (upload->getError() == AssetUpload::NoError) {
 
-        const auto& modelURL = _originalURLs[upload];
-        
-        // successfully uploaded asset - make any required replacements found in the pending replacements
-        auto values = _pendingReplacements.values(modelURL);
-        
-        
-        QString atpURL = getATPUrl(hash, upload->getExtension()).toString();
-        
-        for (auto value : values) {
-            // replace the modelURL in this QJsonValueRef with the hash
-            QJsonObject valueObject = value.toObject();
-            valueObject[MODEL_URL_KEY] = atpURL;
-            value = valueObject;
-        }
-        
-        // add this URL to our list of uploaded assets
-        _uploadedAssets.insert(modelURL, atpURL);
-        
-        // pull the replaced models from _pendingReplacements
-        _pendingReplacements.remove(modelURL);
-        
-        // are we out of pending replacements? if so it is time to save the entity-server file
-        if (_doneReading && _pendingReplacements.empty()) {
-            saveEntityServerFile();
-            
-            // reset after the attempted save, success or fail
-            reset();
-        }
+        // use the path of the migrationURL to add a mapping in the Asset Server
+        auto assetClient = DependencyManager::get<AssetClient>();
+        auto setMappingRequest = assetClient->createSetMappingRequest(migrationURL.path(), hash);
+
+        connect(setMappingRequest, &SetMappingRequest::finished, this, &ATPAssetMigrator::setMappingFinished);
+
+        // add this migrationURL with the key for the SetMappingRequest pointer
+        _originalURLs[setMappingRequest] = migrationURL;
+
+        setMappingRequest->start();
     } else {
-        AssetUploadDialogFactory::showErrorDialog(upload, _dialogParent);
+        // this is a fail for this modelURL, remove it from pending replacements
+        _pendingReplacements.remove(migrationURL);
+
+        ++_errorCount;
+        qWarning() << "Failed to upload" << migrationURL << "- error was" << upload->getErrorString();
     }
+
+    checkIfFinished();
     
     upload->deleteLater();
 }
 
+void ATPAssetMigrator::setMappingFinished(SetMappingRequest* request) {
+    // take the migrationURL for this SetMappingRequest
+    auto migrationURL = _originalURLs.take(request);
+
+    if (request->getError() == MappingRequest::NoError) {
+
+        // successfully uploaded asset - make any required replacements found in the pending replacements
+        auto values = _pendingReplacements.values(migrationURL);
+
+        QString atpURL = QString("atp:%1").arg(request->getPath());
+
+        for (auto value : values) {
+            // replace the modelURL in this QJsonValueRef with the hash
+            QJsonObject valueObject = value.first.toObject();
+
+            if (value.second == 0) {
+                valueObject[MODEL_URL_KEY] = atpURL;
+            } else {
+                valueObject[COMPOUND_SHAPE_URL_KEY] = atpURL;
+            }
+
+            value.first = valueObject;
+        }
+
+        // add this URL to our list of uploaded assets
+        _uploadedAssets.insert(migrationURL, atpURL);
+
+        // pull the replaced urls from _pendingReplacements
+        _pendingReplacements.remove(migrationURL);
+    } else {
+        // this is a fail for this migrationURL, remove it from pending replacements
+        _pendingReplacements.remove(migrationURL);
+
+        ++_errorCount;
+        qWarning() << "Error setting mapping for" << migrationURL << "- error was " << request->getErrorString();
+    }
+
+    checkIfFinished();
+
+    request->deleteLater();
+}
+
+void ATPAssetMigrator::checkIfFinished() {
+    // are we out of pending replacements? if so it is time to save the entity-server file
+    if (_doneReading && _pendingReplacements.empty()) {
+        saveEntityServerFile();
+
+        // reset after the attempted save, success or fail
+        reset();
+    }
+}
+
 bool ATPAssetMigrator::wantsToMigrateResource(const QUrl& url) {
     static bool hasAskedForCompleteMigration { false };
     static bool wantsCompleteMigration { false };
     
     if (!hasAskedForCompleteMigration) {
         // this is the first resource migration - ask the user if they just want to migrate everything
-        static const QString COMPLETE_MIGRATION_TEXT { "Do you want to migrate all assets found in this entity-server file?\n\n"\
-            "Select \"Yes\" to upload all discovered assets to the current asset-server immediately.\n\n"\
+        static const QString COMPLETE_MIGRATION_TEXT { "Do you want to migrate all assets found in this entity-server file?\n"\
+            "Select \"Yes\" to upload all discovered assets to the current asset-server immediately.\n"\
             "Select \"No\" to be prompted for each discovered asset."
         };
         
@@ -236,7 +287,7 @@ bool ATPAssetMigrator::wantsToMigrateResource(const QUrl& url) {
 
 void ATPAssetMigrator::saveEntityServerFile() {
     // show a dialog to ask the user where they want to save the file
-    QString saveName = QFileDialog::getSaveFileName(_dialogParent, "Save Migrated Entities File");
+    QString saveName = OffscreenUi::getSaveFileName(_dialogParent, "Save Migrated Entities File");
     
     QFile saveFile { saveName };
     
@@ -251,9 +302,16 @@ void ATPAssetMigrator::saveEntityServerFile() {
             
             saveFile.write(jsonDataForFile);
             saveFile.close();
-            
-            QMessageBox::information(_dialogParent, "Success",
-                                     QString("Your new entities file has been saved at %1").arg(saveName));
+
+            QString infoMessage = QString("Your new entities file has been saved at\n%1.").arg(saveName);
+
+            if (_errorCount > 0) {
+                infoMessage += QString("\nThere were %1 models that could not be migrated.\n").arg(_errorCount);
+                infoMessage += "Check the warnings in your log for details.\n";
+                infoMessage += "You can re-attempt migration on those models\nby restarting this process with the newly saved file.";
+            }
+
+            OffscreenUi::information(_dialogParent, "Success", infoMessage);
         } else {
             OffscreenUi::warning(_dialogParent, "Error", "Could not gzip JSON data for new entities file.");
         }
@@ -271,4 +329,5 @@ void ATPAssetMigrator::reset() {
     _uploadedAssets.clear();
     _originalURLs.clear();
     _ignoredUrls.clear();
+    _errorCount = 0;
 }

interface/src/assets/ATPAssetMigrator.h

@@ -21,6 +21,7 @@
 
 class AssetUpload;
 class ResourceRequest;
+class SetMappingRequest;
 
 class ATPAssetMigrator : public QObject {
     Q_OBJECT
@@ -32,8 +33,11 @@ public slots:
     void loadEntityServerFile();
 private slots:
     void assetUploadFinished(AssetUpload* upload, const QString& hash);
+    void setMappingFinished(SetMappingRequest* request);
 private:
     void migrateResource(ResourceRequest* request);
+
+    void checkIfFinished();
     void saveEntityServerFile();
     
     void reset();
@@ -44,11 +48,14 @@ private:
     QJsonArray _entitiesArray;
     
     bool _doneReading { false };
-    
-    QMultiHash<QUrl, QJsonValueRef> _pendingReplacements;
+
+    using JSONTypePair = std::pair<QJsonValueRef, quint8>;
+
+    QMultiHash<QUrl, JSONTypePair> _pendingReplacements;
     QHash<QUrl, QUrl> _uploadedAssets;
-    QHash<AssetUpload*, QUrl> _originalURLs;
+    QHash<QObject*, QUrl> _originalURLs;
     QSet<QUrl> _ignoredUrls;
+    int _errorCount { 0 };
 };
 
 

interface/src/avatar/Avatar.cpp

@@ -79,7 +79,6 @@ namespace render {
 
 Avatar::Avatar(RigPointer rig) :
     AvatarData(),
-    _skeletonModel(this, nullptr, rig),
     _skeletonOffset(0.0f),
     _bodyYawDelta(0.0f),
     _positionDeltaAccumulator(0.0f),
@@ -100,6 +99,8 @@ Avatar::Avatar(RigPointer rig) :
 
     // give the pointer to our head to inherited _headData variable from AvatarData
     _headData = static_cast<HeadData*>(new Head(this));
+
+    _skeletonModel = std::make_shared<SkeletonModel>(this, nullptr, rig);
 }
 
 Avatar::~Avatar() {
@@ -112,19 +113,19 @@ Avatar::~Avatar() {
 
 void Avatar::init() {
     getHead()->init();
-    _skeletonModel.init();
+    _skeletonModel->init();
     _initialized = true;
 }
 
 glm::vec3 Avatar::getChestPosition() const {
     // for now, let's just assume that the "chest" is halfway between the root and the neck
     glm::vec3 neckPosition;
-    return _skeletonModel.getNeckPosition(neckPosition) ? (getPosition() + neckPosition) * 0.5f : getPosition();
+    return _skeletonModel->getNeckPosition(neckPosition) ? (getPosition() + neckPosition) * 0.5f : getPosition();
 }
 
 glm::vec3 Avatar::getNeckPosition() const {
     glm::vec3 neckPosition;
-    return _skeletonModel.getNeckPosition(neckPosition) ? neckPosition : getPosition();
+    return _skeletonModel->getNeckPosition(neckPosition) ? neckPosition : getPosition();
 }
 
 
@@ -137,10 +138,10 @@ AABox Avatar::getBounds() const {
     // Except, that getPartBounds produces an infinite, uncentered bounding box when the model is not yet parsed,
     // and we want a centered one. NOTE: There is code that may never try to render, and thus never load and get the
     // real model bounds, if this is unrealistically small.
-    if (!_skeletonModel.isRenderable()) {
+    if (!_skeletonModel->isRenderable()) {
         return AABox(getPosition(), getUniformScale()); // approximately 2m tall, scaled to user request.
     }
-    return _skeletonModel.getPartBounds(0, 0, getPosition(), getOrientation());
+    return _skeletonModel->getPartBounds(0, 0, getPosition(), getOrientation());
 }
 
 void Avatar::animateScaleChanges(float deltaTime) {
@@ -186,13 +187,13 @@ void Avatar::simulate(float deltaTime) {
 
     // simple frustum check
     float boundingRadius = getBoundingRadius();
-    bool inView = qApp->getViewFrustum()->sphereIntersectsFrustum(getPosition(), boundingRadius);
+    bool inView = qApp->getDisplayViewFrustum()->sphereIntersectsFrustum(getPosition(), boundingRadius);
 
     if (_shouldAnimate && !_shouldSkipRender && inView) {
         {
             PerformanceTimer perfTimer("skeleton");
-            _skeletonModel.getRig()->copyJointsFromJointData(_jointData);
-            _skeletonModel.simulate(deltaTime, _hasNewJointRotations || _hasNewJointTranslations);
+            _skeletonModel->getRig()->copyJointsFromJointData(_jointData);
+            _skeletonModel->simulate(deltaTime, _hasNewJointRotations || _hasNewJointTranslations);
             locationChanged(); // joints changed, so if there are any children, update them.
             _hasNewJointRotations = false;
             _hasNewJointTranslations = false;
@@ -200,7 +201,7 @@ void Avatar::simulate(float deltaTime) {
         {
             PerformanceTimer perfTimer("head");
             glm::vec3 headPosition = getPosition();
-            _skeletonModel.getHeadPosition(headPosition);
+            _skeletonModel->getHeadPosition(headPosition);
             Head* head = getHead();
             head->setPosition(headPosition);
             head->setScale(getUniformScale());
@@ -295,8 +296,7 @@ bool Avatar::addToScene(AvatarSharedPointer self, std::shared_ptr<render::Scene>
     auto avatarPayloadPointer = Avatar::PayloadPointer(avatarPayload);
     _renderItemID = scene->allocateID();
     pendingChanges.resetItem(_renderItemID, avatarPayloadPointer);
-    _skeletonModel.addToScene(scene, pendingChanges);
-    getHead()->getFaceModel().addToScene(scene, pendingChanges);
+    _skeletonModel->addToScene(scene, pendingChanges);
 
     for (auto& attachmentModel : _attachmentModels) {
         attachmentModel->addToScene(scene, pendingChanges);
@@ -308,8 +308,7 @@ bool Avatar::addToScene(AvatarSharedPointer self, std::shared_ptr<render::Scene>
 void Avatar::removeFromScene(AvatarSharedPointer self, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) {
     pendingChanges.removeItem(_renderItemID);
     render::Item::clearID(_renderItemID);
-    _skeletonModel.removeFromScene(scene, pendingChanges);
-    getHead()->getFaceModel().removeFromScene(scene, pendingChanges);
+    _skeletonModel->removeFromScene(scene, pendingChanges);
     for (auto& attachmentModel : _attachmentModels) {
         attachmentModel->removeFromScene(scene, pendingChanges);
     }
@@ -340,12 +339,12 @@ void Avatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
             if (_handState & IS_FINGER_POINTING_FLAG) {
                 int leftIndexTip = getJointIndex("LeftHandIndex4");
                 int leftIndexTipJoint = getJointIndex("LeftHandIndex3");
-                havePosition = _skeletonModel.getJointPositionInWorldFrame(leftIndexTip, position);
-                haveRotation = _skeletonModel.getJointRotationInWorldFrame(leftIndexTipJoint, rotation);
+                havePosition = _skeletonModel->getJointPositionInWorldFrame(leftIndexTip, position);
+                haveRotation = _skeletonModel->getJointRotationInWorldFrame(leftIndexTipJoint, rotation);
             } else {
-                int leftHand = _skeletonModel.getLeftHandJointIndex();
-                havePosition = _skeletonModel.getJointPositionInWorldFrame(leftHand, position);
-                haveRotation = _skeletonModel.getJointRotationInWorldFrame(leftHand, rotation);
+                int leftHand = _skeletonModel->getLeftHandJointIndex();
+                havePosition = _skeletonModel->getJointPositionInWorldFrame(leftHand, position);
+                haveRotation = _skeletonModel->getJointRotationInWorldFrame(leftHand, rotation);
             }
 
             if (havePosition && haveRotation) {
@@ -364,12 +363,12 @@ void Avatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
             if (_handState & IS_FINGER_POINTING_FLAG) {
                 int rightIndexTip = getJointIndex("RightHandIndex4");
                 int rightIndexTipJoint = getJointIndex("RightHandIndex3");
-                havePosition = _skeletonModel.getJointPositionInWorldFrame(rightIndexTip, position);
-                haveRotation = _skeletonModel.getJointRotationInWorldFrame(rightIndexTipJoint, rotation);
+                havePosition = _skeletonModel->getJointPositionInWorldFrame(rightIndexTip, position);
+                haveRotation = _skeletonModel->getJointRotationInWorldFrame(rightIndexTipJoint, rotation);
             } else {
-                int rightHand = _skeletonModel.getRightHandJointIndex();
-                havePosition = _skeletonModel.getJointPositionInWorldFrame(rightHand, position);
-                haveRotation = _skeletonModel.getJointRotationInWorldFrame(rightHand, rotation);
+                int rightHand = _skeletonModel->getRightHandJointIndex();
+                havePosition = _skeletonModel->getJointPositionInWorldFrame(rightHand, position);
+                haveRotation = _skeletonModel->getJointRotationInWorldFrame(rightHand, rotation);
             }
 
             if (havePosition && haveRotation) {
@@ -394,7 +393,6 @@ void Avatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
     }
 
     if (!frustum->sphereIntersectsFrustum(getPosition(), boundingRadius)) {
-        endRender();
         return;
     }
 
@@ -426,7 +424,7 @@ void Avatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
             const float LIGHT_EXPONENT = 1.0f;
             const float LIGHT_CUTOFF = glm::radians(80.0f);
             float distance = BASE_LIGHT_DISTANCE * getUniformScale();
-            glm::vec3 position = glm::mix(_skeletonModel.getTranslation(), getHead()->getFaceModel().getTranslation(), 0.9f);
+            glm::vec3 position = _skeletonModel->getTranslation();
             glm::quat orientation = getOrientation();
             foreach (const AvatarManager::LocalLight& light, DependencyManager::get<AvatarManager>()->getLocalLights()) {
                 glm::vec3 direction = orientation * light.direction;
@@ -436,10 +434,10 @@ void Avatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
         }
 
         bool renderBounding = Menu::getInstance()->isOptionChecked(MenuOption::RenderBoundingCollisionShapes);
-        if (renderBounding && shouldRenderHead(renderArgs) && _skeletonModel.isRenderable()) {
+        if (renderBounding && shouldRenderHead(renderArgs) && _skeletonModel->isRenderable()) {
             PROFILE_RANGE_BATCH(batch, __FUNCTION__":skeletonBoundingCollisionShapes");
             const float BOUNDING_SHAPE_ALPHA = 0.7f;
-            _skeletonModel.renderBoundingCollisionShapes(*renderArgs->_batch, getUniformScale(), BOUNDING_SHAPE_ALPHA);
+            _skeletonModel->renderBoundingCollisionShapes(*renderArgs->_batch, getUniformScale(), BOUNDING_SHAPE_ALPHA);
         }
 
         // If this is the avatar being looked at, render a little ball above their head
@@ -468,7 +466,7 @@ void Avatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
                 * (1.0f - ((float)(now - getHead()->getLookingAtMeStarted()))
                 / (LOOKING_AT_ME_DURATION * (float)USECS_PER_SECOND));
             if (alpha > 0.0f) {
-                QSharedPointer<NetworkGeometry> geometry = _skeletonModel.getGeometry();
+                QSharedPointer<NetworkGeometry> geometry = _skeletonModel->getGeometry();
                 if (geometry && geometry->isLoaded()) {
                     const float DEFAULT_EYE_DIAMETER = 0.048f;  // Typical human eye
                     const float RADIUS_INCREMENT = 0.005f;
@@ -513,7 +511,6 @@ void Avatar::render(RenderArgs* renderArgs, const glm::vec3& cameraPosition) {
             renderDisplayName(batch, frustum, textPosition);
         }
     }
-    endRender();
 }
 
 glm::quat Avatar::computeRotationFromBodyToWorldUp(float proportion) const {
@@ -539,14 +536,9 @@ void Avatar::fixupModelsInScene() {
     // fix them up in the scene
     render::ScenePointer scene = qApp->getMain3DScene();
     render::PendingChanges pendingChanges;
-    if (_skeletonModel.isRenderable() && _skeletonModel.needsFixupInScene()) {
-        _skeletonModel.removeFromScene(scene, pendingChanges);
-        _skeletonModel.addToScene(scene, pendingChanges);
-    }
-    Model& faceModel = getHead()->getFaceModel();
-    if (faceModel.isRenderable() && faceModel.needsFixupInScene()) {
-        faceModel.removeFromScene(scene, pendingChanges);
-        faceModel.addToScene(scene, pendingChanges);
+    if (_skeletonModel->isRenderable() && _skeletonModel->needsFixupInScene()) {
+        _skeletonModel->removeFromScene(scene, pendingChanges);
+        _skeletonModel->addToScene(scene, pendingChanges);
     }
     for (auto& attachmentModel : _attachmentModels) {
         if (attachmentModel->isRenderable() && attachmentModel->needsFixupInScene()) {
@@ -564,14 +556,7 @@ void Avatar::fixupModelsInScene() {
 }
 
 void Avatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, float glowLevel) {
-
     fixupModelsInScene();
-
-    {
-        if (_skeletonModel.isRenderable() && getHead()->getFaceModel().isRenderable()) {
-            getHead()->render(renderArgs, 1.0f, renderFrustum);
-        }
-    }
     getHead()->renderLookAts(renderArgs);
 }
 
@@ -593,8 +578,8 @@ void Avatar::simulateAttachments(float deltaTime) {
             model->setRotation(getOrientation() * Quaternions::Y_180);
             model->simulate(deltaTime);
         } else {
-            if (_skeletonModel.getJointPositionInWorldFrame(jointIndex, jointPosition) &&
-                _skeletonModel.getJointRotationInWorldFrame(jointIndex, jointRotation)) {
+            if (_skeletonModel->getJointPositionInWorldFrame(jointIndex, jointPosition) &&
+                _skeletonModel->getJointRotationInWorldFrame(jointIndex, jointRotation)) {
                 model->setTranslation(jointPosition + jointRotation * attachment.translation * getUniformScale());
                 model->setRotation(jointRotation * attachment.rotation);
                 model->setScaleToFit(true, getUniformScale() * attachment.scale, true); // hack to force rescale
@@ -635,7 +620,7 @@ glm::vec3 Avatar::getDisplayNamePosition() const {
     glm::vec3 bodyUpDirection = getBodyUpDirection();
     DEBUG_VALUE("bodyUpDirection =", bodyUpDirection);
 
-    if (getSkeletonModel().getNeckPosition(namePosition)) {
+    if (getSkeletonModel()->getNeckPosition(namePosition)) {
         float headHeight = getHeadHeight();
         DEBUG_VALUE("namePosition =", namePosition);
         DEBUG_VALUE("headHeight =", headHeight);
@@ -780,46 +765,46 @@ QVector<glm::quat> Avatar::getJointRotations() const {
     if (QThread::currentThread() != thread()) {
         return AvatarData::getJointRotations();
     }
-    QVector<glm::quat> jointRotations(_skeletonModel.getJointStateCount());
-    for (int i = 0; i < _skeletonModel.getJointStateCount(); ++i) {
-        _skeletonModel.getJointRotation(i, jointRotations[i]);
+    QVector<glm::quat> jointRotations(_skeletonModel->getJointStateCount());
+    for (int i = 0; i < _skeletonModel->getJointStateCount(); ++i) {
+        _skeletonModel->getJointRotation(i, jointRotations[i]);
     }
     return jointRotations;
 }
 
 glm::quat Avatar::getJointRotation(int index) const {
     glm::quat rotation;
-    _skeletonModel.getJointRotation(index, rotation);
+    _skeletonModel->getJointRotation(index, rotation);
     return rotation;
 }
 
 glm::vec3 Avatar::getJointTranslation(int index) const {
     glm::vec3 translation;
-    _skeletonModel.getJointTranslation(index, translation);
+    _skeletonModel->getJointTranslation(index, translation);
     return translation;
 }
 
 glm::quat Avatar::getDefaultJointRotation(int index) const {
     glm::quat rotation;
-    _skeletonModel.getRelativeDefaultJointRotation(index, rotation);
+    _skeletonModel->getRelativeDefaultJointRotation(index, rotation);
     return rotation;
 }
 
 glm::vec3 Avatar::getDefaultJointTranslation(int index) const {
     glm::vec3 translation;
-    _skeletonModel.getRelativeDefaultJointTranslation(index, translation);
+    _skeletonModel->getRelativeDefaultJointTranslation(index, translation);
     return translation;
 }
 
 glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
     glm::quat rotation;
-    _skeletonModel.getAbsoluteJointRotationInRigFrame(index, rotation);
+    _skeletonModel->getAbsoluteJointRotationInRigFrame(index, rotation);
     return Quaternions::Y_180 * rotation;
 }
 
 glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
     glm::vec3 translation;
-    _skeletonModel.getAbsoluteJointTranslationInRigFrame(index, translation);
+    _skeletonModel->getAbsoluteJointTranslationInRigFrame(index, translation);
     return Quaternions::Y_180 * translation;
 }
 
@@ -830,7 +815,7 @@ int Avatar::getJointIndex(const QString& name) const {
             Q_RETURN_ARG(int, result), Q_ARG(const QString&, name));
         return result;
     }
-    return _skeletonModel.isActive() ? _skeletonModel.getGeometry()->getFBXGeometry().getJointIndex(name) : -1;
+    return _skeletonModel->isActive() ? _skeletonModel->getGeometry()->getFBXGeometry().getJointIndex(name) : -1;
 }
 
 QStringList Avatar::getJointNames() const {
@@ -840,7 +825,7 @@ QStringList Avatar::getJointNames() const {
             Q_RETURN_ARG(QStringList, result));
         return result;
     }
-    return _skeletonModel.isActive() ? _skeletonModel.getGeometry()->getFBXGeometry().getJointNames() : QStringList();
+    return _skeletonModel->isActive() ? _skeletonModel->getGeometry()->getFBXGeometry().getJointNames() : QStringList();
 }
 
 glm::vec3 Avatar::getJointPosition(int index) const {
@@ -851,7 +836,7 @@ glm::vec3 Avatar::getJointPosition(int index) const {
         return position;
     }
     glm::vec3 position;
-    _skeletonModel.getJointPositionInWorldFrame(index, position);
+    _skeletonModel->getJointPositionInWorldFrame(index, position);
     return position;
 }
 
@@ -863,7 +848,7 @@ glm::vec3 Avatar::getJointPosition(const QString& name) const {
         return position;
     }
     glm::vec3 position;
-    _skeletonModel.getJointPositionInWorldFrame(getJointIndex(name), position);
+    _skeletonModel->getJointPositionInWorldFrame(getJointIndex(name), position);
     return position;
 }
 
@@ -872,14 +857,9 @@ void Avatar::scaleVectorRelativeToPosition(glm::vec3 &positionToScale) const {
     positionToScale = getPosition() + getUniformScale() * (positionToScale - getPosition());
 }
 
-void Avatar::setFaceModelURL(const QUrl& faceModelURL) {
-    AvatarData::setFaceModelURL(faceModelURL);
-    getHead()->getFaceModel().setURL(_faceModelURL);
-}
-
 void Avatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     AvatarData::setSkeletonModelURL(skeletonModelURL);
-    _skeletonModel.setURL(_skeletonModelURL);
+    _skeletonModel->setURL(_skeletonModelURL);
 }
 
 // create new model, can return an instance of a SoftAttachmentModel rather then Model
@@ -912,12 +892,12 @@ void Avatar::setAttachmentData(const QVector<AttachmentData>& attachmentData) {
     for (int i = 0; i < attachmentData.size(); i++) {
         if (i == (int)_attachmentModels.size()) {
             // if number of attachments has been increased, we need to allocate a new model
-            _attachmentModels.push_back(allocateAttachmentModel(attachmentData[i].isSoft, _skeletonModel.getRig()));
+            _attachmentModels.push_back(allocateAttachmentModel(attachmentData[i].isSoft, _skeletonModel->getRig()));
         }
         else if (i < oldAttachmentData.size() && oldAttachmentData[i].isSoft != attachmentData[i].isSoft) {
             // if the attachment has changed type, we need to re-allocate a new one.
             _attachmentsToRemove.push_back(_attachmentModels[i]);
-            _attachmentModels[i] = allocateAttachmentModel(attachmentData[i].isSoft, _skeletonModel.getRig());
+            _attachmentModels[i] = allocateAttachmentModel(attachmentData[i].isSoft, _skeletonModel->getRig());
         }
         _attachmentModels[i]->setURL(attachmentData[i].modelURL);
     }
@@ -925,7 +905,6 @@ void Avatar::setAttachmentData(const QVector<AttachmentData>& attachmentData) {
 
 
 int Avatar::parseDataFromBuffer(const QByteArray& buffer) {
-    startUpdate();
     if (!_initialized) {
         // now that we have data for this Avatar we are go for init
         init();
@@ -944,7 +923,6 @@ int Avatar::parseDataFromBuffer(const QByteArray& buffer) {
     if (_moving || _hasNewJointRotations || _hasNewJointTranslations) {
         locationChanged();
     }
-    endUpdate();
 
     return bytesRead;
 }
@@ -1004,24 +982,14 @@ void Avatar::renderJointConnectingCone(gpu::Batch& batch, glm::vec3 position1, g
 }
 
 float Avatar::getSkeletonHeight() const {
-    Extents extents = _skeletonModel.getBindExtents();
+    Extents extents = _skeletonModel->getBindExtents();
     return extents.maximum.y - extents.minimum.y;
 }
 
 float Avatar::getHeadHeight() const {
-    Extents extents = getHead()->getFaceModel().getMeshExtents();
-    if (!extents.isEmpty() && extents.isValid()) {
-
-        // HACK: We have a really odd case when fading out for some models where this value explodes
-        float result = extents.maximum.y - extents.minimum.y;
-        if (result >= 0.0f && result < 100.0f * getUniformScale() ) {
-            return result;
-        }
-    }
-
-    extents = _skeletonModel.getMeshExtents();
+    Extents extents = _skeletonModel->getMeshExtents();
     glm::vec3 neckPosition;
-    if (!extents.isEmpty() && extents.isValid() && _skeletonModel.getNeckPosition(neckPosition)) {
+    if (!extents.isEmpty() && extents.isValid() && _skeletonModel->getNeckPosition(neckPosition)) {
         return extents.maximum.y / 2.0f - neckPosition.y + getPosition().y;
     }
 
@@ -1030,7 +998,7 @@ float Avatar::getHeadHeight() const {
 }
 
 float Avatar::getPelvisFloatingHeight() const {
-    return -_skeletonModel.getBindExtents().minimum.y;
+    return -_skeletonModel->getBindExtents().minimum.y;
 }
 
 void Avatar::setShowDisplayName(bool showDisplayName) {
@@ -1058,9 +1026,9 @@ void Avatar::setShowDisplayName(bool showDisplayName) {
 // virtual
 void Avatar::computeShapeInfo(ShapeInfo& shapeInfo) {
     float uniformScale = getUniformScale();
-    shapeInfo.setCapsuleY(uniformScale * _skeletonModel.getBoundingCapsuleRadius(),
-            0.5f * uniformScale *  _skeletonModel.getBoundingCapsuleHeight());
-    shapeInfo.setOffset(uniformScale * _skeletonModel.getBoundingCapsuleOffset());
+    shapeInfo.setCapsuleY(uniformScale * _skeletonModel->getBoundingCapsuleRadius(),
+            0.5f * uniformScale *  _skeletonModel->getBoundingCapsuleHeight());
+    shapeInfo.setOffset(uniformScale * _skeletonModel->getBoundingCapsuleOffset());
 }
 
 void Avatar::setMotionState(AvatarMotionState* motionState) {
@@ -1098,12 +1066,12 @@ glm::vec3 Avatar::getUncachedLeftPalmPosition() const {
     assert(QThread::currentThread() == thread());  // main thread access only
     glm::quat leftPalmRotation;
     glm::vec3 leftPalmPosition;
-    if (_skeletonModel.getLeftGrabPosition(leftPalmPosition)) {
+    if (_skeletonModel->getLeftGrabPosition(leftPalmPosition)) {
         return leftPalmPosition;
     }
     // avatar didn't have a LeftHandMiddle1 joint, fall back on this:
-    getSkeletonModel().getJointRotationInWorldFrame(getSkeletonModel().getLeftHandJointIndex(), leftPalmRotation);
-    getSkeletonModel().getLeftHandPosition(leftPalmPosition);
+    getSkeletonModel()->getJointRotationInWorldFrame(getSkeletonModel()->getLeftHandJointIndex(), leftPalmRotation);
+    getSkeletonModel()->getLeftHandPosition(leftPalmPosition);
     leftPalmPosition += HAND_TO_PALM_OFFSET * glm::inverse(leftPalmRotation);
     return leftPalmPosition;
 }
@@ -1111,7 +1079,7 @@ glm::vec3 Avatar::getUncachedLeftPalmPosition() const {
 glm::quat Avatar::getUncachedLeftPalmRotation() const {
     assert(QThread::currentThread() == thread());  // main thread access only
     glm::quat leftPalmRotation;
-    getSkeletonModel().getJointRotationInWorldFrame(getSkeletonModel().getLeftHandJointIndex(), leftPalmRotation);
+    getSkeletonModel()->getJointRotationInWorldFrame(getSkeletonModel()->getLeftHandJointIndex(), leftPalmRotation);
     return leftPalmRotation;
 }
 
@@ -1119,12 +1087,12 @@ glm::vec3 Avatar::getUncachedRightPalmPosition() const {
     assert(QThread::currentThread() == thread());  // main thread access only
     glm::quat rightPalmRotation;
     glm::vec3 rightPalmPosition;
-    if (_skeletonModel.getRightGrabPosition(rightPalmPosition)) {
+    if (_skeletonModel->getRightGrabPosition(rightPalmPosition)) {
         return rightPalmPosition;
     }
     // avatar didn't have a RightHandMiddle1 joint, fall back on this:
-    getSkeletonModel().getJointRotationInWorldFrame(getSkeletonModel().getRightHandJointIndex(), rightPalmRotation);
-    getSkeletonModel().getRightHandPosition(rightPalmPosition);
+    getSkeletonModel()->getJointRotationInWorldFrame(getSkeletonModel()->getRightHandJointIndex(), rightPalmRotation);
+    getSkeletonModel()->getRightHandPosition(rightPalmPosition);
     rightPalmPosition += HAND_TO_PALM_OFFSET * glm::inverse(rightPalmRotation);
     return rightPalmPosition;
 }
@@ -1132,7 +1100,7 @@ glm::vec3 Avatar::getUncachedRightPalmPosition() const {
 glm::quat Avatar::getUncachedRightPalmRotation() const {
     assert(QThread::currentThread() == thread());  // main thread access only
     glm::quat rightPalmRotation;
-    getSkeletonModel().getJointRotationInWorldFrame(getSkeletonModel().getRightHandJointIndex(), rightPalmRotation);
+    getSkeletonModel()->getJointRotationInWorldFrame(getSkeletonModel()->getRightHandJointIndex(), rightPalmRotation);
     return rightPalmRotation;
 }
 

interface/src/avatar/Avatar.h

@@ -84,8 +84,8 @@ public:
     bool getIsLookAtTarget() const { return _isLookAtTarget; }
     //getters
     bool isInitialized() const { return _initialized; }
-    SkeletonModel& getSkeletonModel() { return _skeletonModel; }
-    const SkeletonModel& getSkeletonModel() const { return _skeletonModel; }
+    SkeletonModelPointer getSkeletonModel() { return _skeletonModel; }
+    const SkeletonModelPointer getSkeletonModel() const { return _skeletonModel; }
     glm::vec3 getChestPosition() const;
     float getUniformScale() const { return getScale().y; }
     const Head* getHead() const { return static_cast<const Head*>(_headData); }
@@ -114,7 +114,6 @@ public:
     virtual bool setAbsoluteJointRotationInObjectFrame(int index, const glm::quat& rotation) override { return false; }
     virtual bool setAbsoluteJointTranslationInObjectFrame(int index, const glm::vec3& translation) override { return false; }
 
-    virtual void setFaceModelURL(const QUrl& faceModelURL) override;
     virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override;
     virtual void setAttachmentData(const QVector<AttachmentData>& attachmentData) override;
 
@@ -144,7 +143,7 @@ public:
     void scaleVectorRelativeToPosition(glm::vec3 &positionToScale) const;
 
     void slamPosition(const glm::vec3& position);
-    virtual void updateAttitude() override { _skeletonModel.updateAttitude(); }
+    virtual void updateAttitude() override { _skeletonModel->updateAttitude(); }
 
     // Call this when updating Avatar position with a delta.  This will allow us to
     // _accurately_ measure position changes and compute the resulting velocity
@@ -188,7 +187,7 @@ protected:
 
     void setMotionState(AvatarMotionState* motionState);
 
-    SkeletonModel _skeletonModel;
+    SkeletonModelPointer _skeletonModel;
     glm::vec3 _skeletonOffset;
     std::vector<std::shared_ptr<Model>> _attachmentModels;
     std::vector<std::shared_ptr<Model>> _attachmentsToRemove;

interface/src/avatar/AvatarManager.cpp

@@ -145,9 +145,7 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
             removeAvatar(avatarIterator.key());
             ++avatarIterator;
         } else {
-            avatar->startUpdate();
             avatar->simulate(deltaTime);
-            avatar->endUpdate();
             ++avatarIterator;
 
             avatar->updateRenderItem(pendingChanges);
@@ -169,7 +167,6 @@ void AvatarManager::simulateAvatarFades(float deltaTime) {
     render::PendingChanges pendingChanges;
     while (fadingIterator != _avatarFades.end()) {
         auto avatar = std::static_pointer_cast<Avatar>(*fadingIterator);
-        avatar->startUpdate();
         avatar->setTargetScale(avatar->getUniformScale() * SHRINK_RATE);
         if (avatar->getTargetScale() <= MIN_FADE_SCALE) {
             avatar->removeFromScene(*fadingIterator, scene, pendingChanges);
@@ -183,7 +180,6 @@ void AvatarManager::simulateAvatarFades(float deltaTime) {
             avatar->simulate(deltaTime);
             ++fadingIterator;
         }
-        avatar->endUpdate();
     }
     scene->enqueuePendingChanges(pendingChanges);
 }

interface/src/avatar/AvatarUpdate.cpp

@@ -1,84 +0,0 @@
-//
-//  AvatarUpdate.cpp
-//  interface/src/avatar
-//
-//  Created by Howard Stearns on 8/18/15.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-//
-
-#include <DependencyManager.h>
-#include "Application.h"
-#include "AvatarManager.h"
-#include "AvatarUpdate.h"
-#include <display-plugins/DisplayPlugin.h>
-#include "InterfaceLogging.h"
-
-AvatarUpdate::AvatarUpdate() : GenericThread(),  _lastAvatarUpdate(0), _isHMDMode(false) {
-    setObjectName("Avatar Update"); // GenericThread::initialize uses this to set the thread name.
-    Settings settings;
-    const int DEFAULT_TARGET_AVATAR_SIMRATE = 60;
-    _targetInterval = USECS_PER_SECOND / settings.value("AvatarUpdateTargetSimrate", DEFAULT_TARGET_AVATAR_SIMRATE).toInt();
-}
-// We could have the constructor call initialize(), but GenericThread::initialize can take parameters.
-// Keeping it separately called by the client allows that client to pass those without our
-// constructor needing to know about them.
-
-void AvatarUpdate::synchronousProcess() {
-
-    // Keep our own updated value, so that our asynchronous code can consult it.
-    _isHMDMode = qApp->isHMDMode();
-    auto frameCount = qApp->getFrameCount();
-
-    QSharedPointer<AvatarManager> manager = DependencyManager::get<AvatarManager>();
-    MyAvatar* myAvatar = manager->getMyAvatar();
-    assert(myAvatar);
-
-    // transform the head pose from the displayPlugin into avatar coordinates.
-    glm::mat4 invAvatarMat = glm::inverse(createMatFromQuatAndPos(myAvatar->getOrientation(), myAvatar->getPosition()));
-    _headPose = invAvatarMat * (myAvatar->getSensorToWorldMatrix() * qApp->getActiveDisplayPlugin()->getHeadPose(frameCount));
-
-    if (!isThreaded()) {
-        process();
-    }
-}
-
-bool AvatarUpdate::process() {
-    PerformanceTimer perfTimer("AvatarUpdate");
-    quint64 start = usecTimestampNow();
-    quint64 deltaMicroseconds = 10000;
-    if (_lastAvatarUpdate > 0) {
-        deltaMicroseconds = start - _lastAvatarUpdate;
-    } else {
-        deltaMicroseconds = 10000; // 10 ms
-    }
-    float deltaSeconds = (float) deltaMicroseconds / (float) USECS_PER_SECOND;
-    _lastAvatarUpdate = start;
-    qApp->setAvatarSimrateSample(1.0f / deltaSeconds);
-
-    QSharedPointer<AvatarManager> manager = DependencyManager::get<AvatarManager>();
-    MyAvatar* myAvatar = manager->getMyAvatar();
-
-    //loop through all the other avatars and simulate them...
-    //gets current lookat data, removes missing avatars, etc.
-    manager->updateOtherAvatars(deltaSeconds);
-
-    myAvatar->startUpdate();
-    qApp->updateMyAvatarLookAtPosition();
-    // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes
-    manager->updateMyAvatar(deltaSeconds);
-    myAvatar->endUpdate();
-
-    if (!isThreaded()) {
-        return true;
-    }
-    int elapsed = (usecTimestampNow() - start);
-    int usecToSleep =  _targetInterval - elapsed;
-    if (usecToSleep < 0) {
-        usecToSleep = 1; // always yield
-    }
-    usleep(usecToSleep);
-    return true;
-}

interface/src/avatar/AvatarUpdate.h

@@ -1,41 +0,0 @@
-//
-//  AvatarUpdate.h
-//  interface/src/avatar
-//
-//  Created by Howard Stearns on 8/18/15.
-///
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-//
-
-#ifndef __hifi__AvatarUpdate__
-#define __hifi__AvatarUpdate__
-
-#include <QtCore/QObject>
-#include <QTimer>
-
-// Home for the avatarUpdate operations (e.g., whether on a separate thread, pipelined in various ways, etc.)
-// This might get folded into AvatarManager.
-class AvatarUpdate : public GenericThread {
-    Q_OBJECT
-public:
-    AvatarUpdate();
-    void synchronousProcess();
-
-private:
-    virtual bool process(); // No reason for other classes to invoke this.
-    quint64 _lastAvatarUpdate; // microsoeconds
-    quint64 _targetInterval; // microseconds
-
-    // Goes away if Application::getActiveDisplayPlugin() and friends are made thread safe:
-public:
-    bool isHMDMode() { return _isHMDMode; }
-    glm::mat4 getHeadPose() { return _headPose; }
-private:
-    bool _isHMDMode;
-    glm::mat4 _headPose;
-};
-
-
-#endif /* defined(__hifi__AvatarUpdate__) */

interface/src/avatar/FaceModel.cpp

@@ -1,58 +0,0 @@
-//
-//  FaceModel.cpp
-//  interface/src/avatar
-//
-//  Created by Andrzej Kapolka on 9/16/13.
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <glm/gtx/transform.hpp>
-
-#include "Avatar.h"
-#include "FaceModel.h"
-#include "Head.h"
-#include "Menu.h"
-
-FaceModel::FaceModel(Head* owningHead, RigPointer rig) :
-    Model(rig, nullptr),
-    _owningHead(owningHead)
-{
-    assert(_rig);
-}
-
-void FaceModel::simulate(float deltaTime, bool fullUpdate) {
-    updateGeometry();
-
-    Avatar* owningAvatar = static_cast<Avatar*>(_owningHead->_owningAvatar);
-    glm::vec3 neckPosition;
-    if (!owningAvatar->getSkeletonModel().getNeckPosition(neckPosition)) {
-        neckPosition = owningAvatar->getPosition();
-    }
-    setTranslation(neckPosition);
-    glm::quat neckParentRotation = owningAvatar->getOrientation();
-    setRotation(neckParentRotation);
-    setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningHead->getScale());
-
-    setPupilDilation(_owningHead->getPupilDilation());
-    setBlendshapeCoefficients(_owningHead->getBlendshapeCoefficients());
-
-    // FIXME - this is very expensive, we shouldn't do it if we don't have to
-    //invalidCalculatedMeshBoxes();
-
-    if (isActive()) {
-        setOffset(-_geometry->getFBXGeometry().neckPivot);
-        Model::simulateInternal(deltaTime);
-    }
-}
-
-bool FaceModel::getEyePositions(glm::vec3& firstEyePosition, glm::vec3& secondEyePosition) const {
-    if (!isActive()) {
-        return false;
-    }
-    const FBXGeometry& geometry = _geometry->getFBXGeometry();
-    return getJointPositionInWorldFrame(geometry.leftEyeJointIndex, firstEyePosition) &&
-        getJointPositionInWorldFrame(geometry.rightEyeJointIndex, secondEyePosition);
-}

interface/src/avatar/FaceModel.h

@@ -1,38 +0,0 @@
-//
-//  FaceModel.h
-//  interface/src/avatar
-//
-//  Created by Andrzej Kapolka on 9/16/13.
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_FaceModel_h
-#define hifi_FaceModel_h
-
-#include <Model.h>
-
-class Head;
-
-/// A face formed from a linear mix of blendshapes according to a set of coefficients.
-class FaceModel : public Model {
-    Q_OBJECT
-
-public:
-
-    FaceModel(Head* owningHead, RigPointer rig);
-
-    virtual void simulate(float deltaTime, bool fullUpdate = true);
-
-    /// Retrieve the positions of up to two eye meshes.
-    /// \return whether or not both eye meshes were found
-    bool getEyePositions(glm::vec3& firstEyePosition, glm::vec3& secondEyePosition) const;
-
-private:
-
-    Head* _owningHead;
-};
-
-#endif // hifi_FaceModel_h

interface/src/avatar/Head.cpp

@@ -62,20 +62,17 @@ Head::Head(Avatar* owningAvatar) :
     _isLookingAtMe(false),
     _lookingAtMeStarted(0),
     _wasLastLookingAtMe(0),
-    _faceModel(this, std::make_shared<Rig>()),
     _leftEyeLookAtID(DependencyManager::get<GeometryCache>()->allocateID()),
     _rightEyeLookAtID(DependencyManager::get<GeometryCache>()->allocateID())
 {
 }
 
 void Head::init() {
-    _faceModel.init();
 }
 
 void Head::reset() {
     _baseYaw = _basePitch = _baseRoll = 0.0f;
     _leanForward = _leanSideways = 0.0f;
-    _faceModel.reset();
 }
 
 void Head::simulate(float deltaTime, bool isMine, bool billboard) {
@@ -233,13 +230,14 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
     }
     
     _leftEyePosition = _rightEyePosition = getPosition();
-    if (!billboard) {
-        _faceModel.simulate(deltaTime);
-        if (!_faceModel.getEyePositions(_leftEyePosition, _rightEyePosition)) {
-            static_cast<Avatar*>(_owningAvatar)->getSkeletonModel().getEyePositions(_leftEyePosition, _rightEyePosition);
+    _eyePosition = calculateAverageEyePosition();
+
+    if (!billboard && _owningAvatar) {
+        auto skeletonModel = static_cast<Avatar*>(_owningAvatar)->getSkeletonModel();
+        if (skeletonModel) {
+            skeletonModel->getEyePositions(_leftEyePosition, _rightEyePosition);
         }
     }
-    _eyePosition = calculateAverageEyePosition();
 }
 
 void Head::calculateMouthShapes() {
@@ -391,7 +389,7 @@ glm::quat Head::getCameraOrientation() const {
     // to change the driving direction while in Oculus mode. It is used to support driving toward where you're
     // head is looking. Note that in oculus mode, your actual camera view and where your head is looking is not
     // always the same.
-    if (qApp->getAvatarUpdater()->isHMDMode()) {
+    if (qApp->isHMDMode()) {
         MyAvatar* myAvatar = dynamic_cast<MyAvatar*>(_owningAvatar);
         if (myAvatar) {
             return glm::quat_cast(myAvatar->getSensorToWorldMatrix()) * myAvatar->getHMDSensorOrientation();
@@ -411,7 +409,7 @@ glm::quat Head::getEyeRotation(const glm::vec3& eyePosition) const {
 }
 
 glm::vec3 Head::getScalePivot() const {
-    return _faceModel.isActive() ? _faceModel.getTranslation() : _position;
+    return _position;
 }
 
 void Head::setFinalPitch(float finalPitch) {

interface/src/avatar/Head.h

@@ -18,7 +18,6 @@
 
 #include <HeadData.h>
 
-#include "FaceModel.h"
 #include "world.h"
 
 
@@ -76,9 +75,6 @@ public:
     glm::vec3 getLeftEarPosition() const { return _leftEyePosition + (getRightDirection() * -EYE_EAR_GAP) + (getFrontDirection() * -EYE_EAR_GAP); }
     glm::vec3 getMouthPosition() const { return _eyePosition - getUpDirection() * glm::length(_rightEyePosition - _leftEyePosition); }
 
-    FaceModel& getFaceModel() { return _faceModel; }
-    const FaceModel& getFaceModel() const { return _faceModel; }
-    
     bool getReturnToCenter() const { return _returnHeadToCenter; } // Do you want head to try to return to center (depends on interface detected)
     float getAverageLoudness() const { return _averageLoudness; }
     /// \return the point about which scaling occurs.
@@ -150,7 +146,6 @@ private:
     bool _isLookingAtMe;
     quint64 _lookingAtMeStarted;
     quint64 _wasLastLookingAtMe;
-    FaceModel _faceModel;
     
     glm::vec3 _correctedLookAtPosition;
 
@@ -162,8 +157,6 @@ private:
     void renderLookatTarget(RenderArgs* renderArgs, glm::vec3 lookatPosition);
     void calculateMouthShapes();
     void applyEyelidOffset(glm::quat headOrientation);
-
-    friend class FaceModel;
 };
 
 #endif // hifi_Head_h

interface/src/avatar/MyAvatar.cpp

@@ -167,11 +167,6 @@ MyAvatar::MyAvatar(RigPointer rig) :
         }
 
         auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
-        if (recordingInterface->getPlayerUseHeadModel() && dummyAvatar.getFaceModelURL().isValid() &&
-            (dummyAvatar.getFaceModelURL() != getFaceModelURL())) {
-            // FIXME
-            //myAvatar->setFaceModelURL(_dummyAvatar.getFaceModelURL());
-        }
 
         if (recordingInterface->getPlayerUseSkeletonModel() && dummyAvatar.getSkeletonModelURL().isValid() &&
             (dummyAvatar.getSkeletonModelURL() != getSkeletonModelURL())) {
@@ -230,14 +225,11 @@ QByteArray MyAvatar::toByteArray(bool cullSmallChanges, bool sendAll) {
 }
 
 void MyAvatar::reset(bool andReload) {
-    if (andReload) {
-        qApp->setRawAvatarUpdateThreading(false);
-    }
 
     // Reset dynamic state.
     _wasPushing = _isPushing = _isBraking = false;
     _follow.deactivate();
-    _skeletonModel.reset();
+    _skeletonModel->reset();
     getHead()->reset();
     _targetVelocity = glm::vec3(0.0f);
     setThrust(glm::vec3(0.0f));
@@ -343,10 +335,10 @@ void MyAvatar::simulate(float deltaTime) {
 
     {
         PerformanceTimer perfTimer("skeleton");
-        _skeletonModel.simulate(deltaTime);
+        _skeletonModel->simulate(deltaTime);
     }
 
-    if (!_skeletonModel.hasSkeleton()) {
+    if (!_skeletonModel->hasSkeleton()) {
         // All the simulation that can be done has been done
         return;
     }
@@ -361,7 +353,7 @@ void MyAvatar::simulate(float deltaTime) {
         PerformanceTimer perfTimer("head");
         Head* head = getHead();
         glm::vec3 headPosition;
-        if (!_skeletonModel.getHeadPosition(headPosition)) {
+        if (!_skeletonModel->getHeadPosition(headPosition)) {
             headPosition = getPosition();
         }
         head->setPosition(headPosition);
@@ -426,7 +418,7 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) {
     _hmdSensorFacing = getFacingDir2D(_hmdSensorOrientation);
 }
 
-// best called at end of main loop, just before rendering.
+// best called at end of main loop, after physics.
 // update sensor to world matrix from current body position and hmd sensor.
 // This is so the correct camera can be used for rendering.
 void MyAvatar::updateSensorToWorldMatrix() {
@@ -449,7 +441,7 @@ void MyAvatar::updateSensorToWorldMatrix() {
 void MyAvatar::updateFromTrackers(float deltaTime) {
     glm::vec3 estimatedPosition, estimatedRotation;
 
-    bool inHmd = qApp->getAvatarUpdater()->isHMDMode();
+    bool inHmd = qApp->isHMDMode();
     bool playing = DependencyManager::get<recording::Deck>()->isPlaying();
     if (inHmd && playing) {
         return;
@@ -716,7 +708,7 @@ void MyAvatar::setEnableDebugDrawSensorToWorldMatrix(bool isEnabled) {
 
 void MyAvatar::setEnableMeshVisible(bool isEnabled) {
     render::ScenePointer scene = qApp->getMain3DScene();
-    _skeletonModel.setVisibleInScene(isEnabled, scene);
+    _skeletonModel->setVisibleInScene(isEnabled, scene);
 }
 
 void MyAvatar::setUseAnimPreAndPostRotations(bool isEnabled) {
@@ -783,7 +775,7 @@ void MyAvatar::loadData() {
 void MyAvatar::saveAttachmentData(const AttachmentData& attachment) const {
     Settings settings;
     settings.beginGroup("savedAttachmentData");
-    settings.beginGroup(_skeletonModel.getURL().toString());
+    settings.beginGroup(_skeletonModel->getURL().toString());
     settings.beginGroup(attachment.modelURL.toString());
     settings.setValue("jointName", attachment.jointName);
 
@@ -806,7 +798,7 @@ void MyAvatar::saveAttachmentData(const AttachmentData& attachment) const {
 AttachmentData MyAvatar::loadAttachmentData(const QUrl& modelURL, const QString& jointName) const {
     Settings settings;
     settings.beginGroup("savedAttachmentData");
-    settings.beginGroup(_skeletonModel.getURL().toString());
+    settings.beginGroup(_skeletonModel->getURL().toString());
     settings.beginGroup(modelURL.toString());
 
     AttachmentData attachment;
@@ -905,7 +897,9 @@ void MyAvatar::updateLookAtTargetAvatar() {
                     // Scale by proportional differences between avatar and human.
                     float humanEyeSeparationInModelSpace = glm::length(humanLeftEye - humanRightEye) * ipdScale;
                     float avatarEyeSeparation = glm::length(avatarLeftEye - avatarRightEye);
-                    gazeOffset = gazeOffset * humanEyeSeparationInModelSpace / avatarEyeSeparation;
+                    if (avatarEyeSeparation > 0.0f) {
+                        gazeOffset = gazeOffset * humanEyeSeparationInModelSpace / avatarEyeSeparation;
+                    }
                 }
 
                 // And now we can finally add that offset to the camera.
@@ -951,17 +945,17 @@ eyeContactTarget MyAvatar::getEyeContactTarget() {
 }
 
 glm::vec3 MyAvatar::getDefaultEyePosition() const {
-    return getPosition() + getWorldAlignedOrientation() * Quaternions::Y_180 * _skeletonModel.getDefaultEyeModelPosition();
+    return getPosition() + getWorldAlignedOrientation() * Quaternions::Y_180 * _skeletonModel->getDefaultEyeModelPosition();
 }
 
 const float SCRIPT_PRIORITY = 1.0f + 1.0f;
 const float RECORDER_PRIORITY = 1.0f + 1.0f;
 
 void MyAvatar::setJointRotations(QVector<glm::quat> jointRotations) {
-    int numStates = glm::min(_skeletonModel.getJointStateCount(), jointRotations.size());
+    int numStates = glm::min(_skeletonModel->getJointStateCount(), jointRotations.size());
     for (int i = 0; i < numStates; ++i) {
         // HACK: ATM only Recorder calls setJointRotations() so we hardcode its priority here
-        _skeletonModel.setJointRotation(i, true, jointRotations[i], RECORDER_PRIORITY);
+        _skeletonModel->setJointRotation(i, true, jointRotations[i], RECORDER_PRIORITY);
     }
 }
 
@@ -1009,18 +1003,11 @@ void MyAvatar::clearJointsData() {
     _rig->clearJointStates();
 }
 
-void MyAvatar::setFaceModelURL(const QUrl& faceModelURL) {
-
-    Avatar::setFaceModelURL(faceModelURL);
-    render::ScenePointer scene = qApp->getMain3DScene();
-    getHead()->getFaceModel().setVisibleInScene(_prevShouldDrawHead, scene);
-}
-
 void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
 
     Avatar::setSkeletonModelURL(skeletonModelURL);
     render::ScenePointer scene = qApp->getMain3DScene();
-    _skeletonModel.setVisibleInScene(true, scene);
+    _skeletonModel->setVisibleInScene(true, scene);
     _headBoneSet.clear();
 }
 
@@ -1051,15 +1038,9 @@ void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelN
         }
     }
 
-    if (!getFaceModelURLString().isEmpty()) {
-        setFaceModelURL(QString());
-    }
-
     const QString& urlString = fullAvatarURL.toString();
     if (urlString.isEmpty() || (fullAvatarURL != getSkeletonModelURL())) {
-        qApp->setRawAvatarUpdateThreading(false);
         setSkeletonModelURL(fullAvatarURL);
-        qApp->setRawAvatarUpdateThreading();
         UserActivityLogger::getInstance().changedModel("skeleton", urlString);
     }
     sendIdentityPacket();
@@ -1088,10 +1069,10 @@ glm::vec3 MyAvatar::getSkeletonPosition() const {
 void MyAvatar::rebuildCollisionShape() {
     // compute localAABox
     float scale = getUniformScale();
-    float radius = scale * _skeletonModel.getBoundingCapsuleRadius();
-    float height = scale * _skeletonModel.getBoundingCapsuleHeight() + 2.0f * radius;
+    float radius = scale * _skeletonModel->getBoundingCapsuleRadius();
+    float height = scale * _skeletonModel->getBoundingCapsuleHeight() + 2.0f * radius;
     glm::vec3 corner(-radius, -0.5f * height, -radius);
-    corner += scale * _skeletonModel.getBoundingCapsuleOffset();
+    corner += scale * _skeletonModel->getBoundingCapsuleOffset();
     glm::vec3 diagonal(2.0f * radius, height, 2.0f * radius);
     _characterController.setLocalBoundingBox(corner, diagonal);
 }
@@ -1108,24 +1089,32 @@ static controller::Pose applyLowVelocityFilter(const controller::Pose& oldPose,
     return finalPose;
 }
 
-void MyAvatar::setHandControllerPosesInWorldFrame(const controller::Pose& left, const controller::Pose& right) {
+void MyAvatar::setHandControllerPosesInSensorFrame(const controller::Pose& left, const controller::Pose& right) {
     if (controller::InputDevice::getLowVelocityFilter()) {
-        auto oldLeftPose = getLeftHandControllerPoseInWorldFrame();
-        auto oldRightPose = getRightHandControllerPoseInWorldFrame();
-        _leftHandControllerPoseInWorldFrameCache.set(applyLowVelocityFilter(oldLeftPose, left));
-        _rightHandControllerPoseInWorldFrameCache.set(applyLowVelocityFilter(oldRightPose, right));
+        auto oldLeftPose = getLeftHandControllerPoseInSensorFrame();
+        auto oldRightPose = getRightHandControllerPoseInSensorFrame();
+        _leftHandControllerPoseInSensorFrameCache.set(applyLowVelocityFilter(oldLeftPose, left));
+        _rightHandControllerPoseInSensorFrameCache.set(applyLowVelocityFilter(oldRightPose, right));
     } else {
-        _leftHandControllerPoseInWorldFrameCache.set(left);
-        _rightHandControllerPoseInWorldFrameCache.set(right);
+        _leftHandControllerPoseInSensorFrameCache.set(left);
+        _rightHandControllerPoseInSensorFrameCache.set(right);
     }
 }
 
+controller::Pose MyAvatar::getLeftHandControllerPoseInSensorFrame() const {
+    return _leftHandControllerPoseInSensorFrameCache.get();
+}
+
+controller::Pose MyAvatar::getRightHandControllerPoseInSensorFrame() const {
+    return _rightHandControllerPoseInSensorFrameCache.get();
+}
+
 controller::Pose MyAvatar::getLeftHandControllerPoseInWorldFrame() const {
-    return _leftHandControllerPoseInWorldFrameCache.get();
+    return _leftHandControllerPoseInSensorFrameCache.get().transform(getSensorToWorldMatrix());
 }
 
 controller::Pose MyAvatar::getRightHandControllerPoseInWorldFrame() const {
-    return _rightHandControllerPoseInWorldFrameCache.get();
+    return _rightHandControllerPoseInSensorFrameCache.get().transform(getSensorToWorldMatrix());
 }
 
 controller::Pose MyAvatar::getLeftHandControllerPoseInAvatarFrame() const {
@@ -1243,7 +1232,7 @@ void MyAvatar::attach(const QString& modelURL, const QString& jointName,
 
 void MyAvatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, float glowLevel) {
 
-    if (!_skeletonModel.isRenderable()) {
+    if (!_skeletonModel->isRenderable()) {
         return; // wait until all models are loaded
     }
 
@@ -1258,7 +1247,7 @@ void MyAvatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, fl
     if (qApp->isHMDMode()) {
         glm::vec3 cameraPosition = qApp->getCamera()->getPosition();
 
-        glm::mat4 headPose = qApp->getActiveDisplayPlugin()->getHeadPose(qApp->getFrameCount());
+        glm::mat4 headPose = qApp->getActiveDisplayPlugin()->getHeadPose();
         glm::mat4 leftEyePose = qApp->getActiveDisplayPlugin()->getEyeToHeadTransform(Eye::Left);
         leftEyePose = leftEyePose * headPose;
         glm::vec3 leftEyePosition = extractTranslation(leftEyePose);
@@ -1283,8 +1272,8 @@ void MyAvatar::setVisibleInSceneIfReady(Model* model, render::ScenePointer scene
 
 void MyAvatar::initHeadBones() {
     int neckJointIndex = -1;
-    if (_skeletonModel.getGeometry()) {
-        neckJointIndex = _skeletonModel.getGeometry()->getFBXGeometry().neckJointIndex;
+    if (_skeletonModel->getGeometry()) {
+        neckJointIndex = _skeletonModel->getGeometry()->getFBXGeometry().neckJointIndex;
     }
     if (neckJointIndex == -1) {
         return;
@@ -1297,8 +1286,8 @@ void MyAvatar::initHeadBones() {
     // fbxJoints only hold links to parents not children, so we have to do a bit of extra work here.
     while (q.size() > 0) {
         int jointIndex = q.front();
-        for (int i = 0; i < _skeletonModel.getJointStateCount(); i++) {
-            if (jointIndex == _skeletonModel.getParentJointIndex(i)) {
+        for (int i = 0; i < _skeletonModel->getJointStateCount(); i++) {
+            if (jointIndex == _skeletonModel->getParentJointIndex(i)) {
                 _headBoneSet.insert(i);
                 q.push(i);
             }
@@ -1312,7 +1301,7 @@ void MyAvatar::setAnimGraphUrl(const QUrl& url) {
         return;
     }
     destroyAnimGraph();
-    _skeletonModel.reset(); // Why is this necessary? Without this, we crash in the next render.
+    _skeletonModel->reset(); // Why is this necessary? Without this, we crash in the next render.
     _animGraphUrl = url;
     initAnimGraph();
 }
@@ -1351,9 +1340,9 @@ void MyAvatar::preRender(RenderArgs* renderArgs) {
     render::ScenePointer scene = qApp->getMain3DScene();
     const bool shouldDrawHead = shouldRenderHead(renderArgs);
 
-    if (_skeletonModel.initWhenReady(scene)) {
+    if (_skeletonModel->initWhenReady(scene)) {
         initHeadBones();
-        _skeletonModel.setCauterizeBoneSet(_headBoneSet);
+        _skeletonModel->setCauterizeBoneSet(_headBoneSet);
         initAnimGraph();
     }
 
@@ -1362,7 +1351,7 @@ void MyAvatar::preRender(RenderArgs* renderArgs) {
         auto animSkeleton = _rig->getAnimSkeleton();
 
         // the rig is in the skeletonModel frame
-        AnimPose xform(glm::vec3(1), _skeletonModel.getRotation(), _skeletonModel.getTranslation());
+        AnimPose xform(glm::vec3(1), _skeletonModel->getRotation(), _skeletonModel->getTranslation());
 
         if (_enableDebugDrawDefaultPose && animSkeleton) {
             glm::vec4 gray(0.2f, 0.2f, 0.2f, 0.2f);
@@ -1402,7 +1391,7 @@ void MyAvatar::preRender(RenderArgs* renderArgs) {
     DebugDraw::getInstance().updateMyAvatarRot(getOrientation());
 
     if (shouldDrawHead != _prevShouldDrawHead) {
-        _skeletonModel.setCauterizeBones(!shouldDrawHead);
+        _skeletonModel->setCauterizeBones(!shouldDrawHead);
     }
     _prevShouldDrawHead = shouldDrawHead;
 }
@@ -1493,7 +1482,7 @@ void MyAvatar::updateOrientation(float deltaTime) {
 
     getHead()->setBasePitch(getHead()->getBasePitch() + _driveKeys[PITCH] * _pitchSpeed * deltaTime);
 
-    if (qApp->getAvatarUpdater()->isHMDMode()) {
+    if (qApp->isHMDMode()) {
         glm::quat orientation = glm::quat_cast(getSensorToWorldMatrix()) * getHMDSensorOrientation();
         glm::quat bodyOrientation = getWorldBodyOrientation();
         glm::quat localOrientation = glm::inverse(bodyOrientation) * orientation;

interface/src/avatar/MyAvatar.h

@@ -178,8 +178,6 @@ public:
     Q_INVOKABLE float getHeadFinalRoll() const { return getHead()->getFinalRoll(); }
     Q_INVOKABLE float getHeadFinalPitch() const { return getHead()->getFinalPitch(); }
     Q_INVOKABLE float getHeadDeltaPitch() const { return getHead()->getDeltaPitch(); }
-    Q_INVOKABLE int getFaceBlendCoefNum() const { return getHead()->getFaceModel().getBlendshapeCoefficientsNum(); }
-    Q_INVOKABLE float getFaceBlendCoef(int index) const { return getHead()->getFaceModel().getBlendshapeCoefficient(index); }
 
     Q_INVOKABLE glm::vec3 getEyePosition() const { return getHead()->getEyePosition(); }
 
@@ -249,7 +247,9 @@ public:
 
     virtual void rebuildCollisionShape() override;
 
-    void setHandControllerPosesInWorldFrame(const controller::Pose& left, const controller::Pose& right);
+    void setHandControllerPosesInSensorFrame(const controller::Pose& left, const controller::Pose& right);
+    controller::Pose getLeftHandControllerPoseInSensorFrame() const;
+    controller::Pose getRightHandControllerPoseInSensorFrame() const;
     controller::Pose getLeftHandControllerPoseInWorldFrame() const;
     controller::Pose getRightHandControllerPoseInWorldFrame() const;
     controller::Pose getLeftHandControllerPoseInAvatarFrame() const;
@@ -279,7 +279,7 @@ public slots:
     void setEnableDebugDrawPosition(bool isEnabled);
     void setEnableDebugDrawHandControllers(bool isEnabled);
     void setEnableDebugDrawSensorToWorldMatrix(bool isEnabled);
-    bool getEnableMeshVisible() const { return _skeletonModel.isVisible(); }
+    bool getEnableMeshVisible() const { return _skeletonModel->isVisible(); }
     void setEnableMeshVisible(bool isEnabled);
     void setUseAnimPreAndPostRotations(bool isEnabled);
     void setEnableInverseKinematics(bool isEnabled);
@@ -328,7 +328,6 @@ private:
     bool cameraInsideHead() const;
 
     // These are made private for MyAvatar so that you will use the "use" methods instead
-    virtual void setFaceModelURL(const QUrl& faceModelURL) override;
     virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) override;
 
     void setVisibleInSceneIfReady(Model* model, render::ScenePointer scene, bool visiblity);
@@ -454,9 +453,9 @@ private:
     bool _hoverReferenceCameraFacingIsCaptured { false };
     glm::vec3 _hoverReferenceCameraFacing { 0.0f, 0.0f, -1.0f }; // hmd sensor space
 
-    // These are stored in WORLD frame
-    ThreadSafeValueCache<controller::Pose> _leftHandControllerPoseInWorldFrameCache { controller::Pose() };
-    ThreadSafeValueCache<controller::Pose> _rightHandControllerPoseInWorldFrameCache { controller::Pose() };
+    // These are stored in SENSOR frame
+    ThreadSafeValueCache<controller::Pose> _leftHandControllerPoseInSensorFrameCache { controller::Pose() };
+    ThreadSafeValueCache<controller::Pose> _rightHandControllerPoseInSensorFrameCache { controller::Pose() };
 
     float AVATAR_MOVEMENT_ENERGY_CONSTANT { 0.001f };
     float AUDIO_ENERGY_CONSTANT { 0.000001f };

interface/src/avatar/SkeletonModel.cpp

@@ -93,12 +93,12 @@ void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
         const FBXGeometry& geometry = _geometry->getFBXGeometry();
 
         Rig::HeadParameters headParams;
-        headParams.enableLean = qApp->getAvatarUpdater()->isHMDMode();
+        headParams.enableLean = qApp->isHMDMode();
         headParams.leanSideways = head->getFinalLeanSideways();
         headParams.leanForward = head->getFinalLeanForward();
         headParams.torsoTwist = head->getTorsoTwist();
 
-        if (qApp->getAvatarUpdater()->isHMDMode()) {
+        if (qApp->isHMDMode()) {
             headParams.isInHMD = true;
 
             // get HMD position from sensor space into world space, and back into rig space

interface/src/avatar/SkeletonModel.h

@@ -18,6 +18,10 @@
 class Avatar;
 class MuscleConstraint;
 
+class SkeletonModel;
+using SkeletonModelPointer = std::shared_ptr<SkeletonModel>;
+using SkeletonModelWeakPointer = std::weak_ptr<SkeletonModel>;
+
 /// A skeleton loaded from a model.
 class SkeletonModel : public Model {
     Q_OBJECT

interface/src/avatar/SoftAttachmentModel.cpp

@@ -79,6 +79,6 @@ void SoftAttachmentModel::updateClusterMatrices(glm::vec3 modelPosition, glm::qu
     // post the blender if we're not currently waiting for one to finish
     if (geometry.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) {
         _blendedBlendshapeCoefficients = _blendshapeCoefficients;
-        DependencyManager::get<ModelBlender>()->noteRequiresBlend(this);
+        DependencyManager::get<ModelBlender>()->noteRequiresBlend(getThisPointer());
     }
 }

interface/src/main.cpp

@@ -23,6 +23,7 @@
 #include "AddressManager.h"
 #include "Application.h"
 #include "InterfaceLogging.h"
+#include "UserActivityLogger.h"
 #include "MainWindow.h"
 
 #ifdef HAS_BUGSPLAT
@@ -39,7 +40,7 @@ int main(int argc, const char* argv[]) {
     static const DWORD BUG_SPLAT_FLAGS = MDSF_PREVENTHIJACKING | MDSF_USEGUARDMEMORY;
     static const char* BUG_SPLAT_DATABASE = "interface_alpha";
     static const char* BUG_SPLAT_APPLICATION_NAME = "Interface";
-    MiniDmpSender mpSender { BUG_SPLAT_DATABASE, BUG_SPLAT_APPLICATION_NAME, BuildInfo::VERSION.toLatin1().constData(),
+    MiniDmpSender mpSender { BUG_SPLAT_DATABASE, BUG_SPLAT_APPLICATION_NAME, qPrintable(BuildInfo::VERSION),
                              nullptr, BUG_SPLAT_FLAGS };
 #endif
     
@@ -102,11 +103,19 @@ int main(int argc, const char* argv[]) {
     // Check OpenGL version.
     // This is done separately from the main Application so that start-up and shut-down logic within the main Application is
     // not made more complicated than it already is.
+    bool override = false;
+    QString glVersion;
     {
         OpenGLVersionChecker openGLVersionChecker(argc, const_cast<char**>(argv));
-        if (!openGLVersionChecker.isValidVersion()) {
-            qCDebug(interfaceapp, "Early exit due to OpenGL version.");
-            return 0;
+        bool valid = true;
+        glVersion = openGLVersionChecker.checkVersion(valid, override);
+        if (!valid) {
+            if (override) {
+                qCDebug(interfaceapp, "Running on insufficient OpenGL version: %s.", glVersion.toStdString().c_str());
+            } else {
+                qCDebug(interfaceapp, "Early exit due to OpenGL version.");
+                return 0;
+            }
         }
     }
 
@@ -134,6 +143,22 @@ int main(int argc, const char* argv[]) {
         QSettings::setDefaultFormat(QSettings::IniFormat);
         Application app(argc, const_cast<char**>(argv), startupTime);
 
+        // If we failed the OpenGLVersion check, log it.
+        if (override) {
+            auto& accountManager = AccountManager::getInstance();
+            if (accountManager.isLoggedIn()) {
+                UserActivityLogger::getInstance().insufficientGLVersion(glVersion);
+            } else {
+                QObject::connect(&AccountManager::getInstance(), &AccountManager::loginComplete, [glVersion](){
+                    static bool loggedInsufficientGL = false;
+                    if (!loggedInsufficientGL) {
+                        UserActivityLogger::getInstance().insufficientGLVersion(glVersion);
+                        loggedInsufficientGL = true;
+                    }
+                });
+            }
+        }
+
         // Setup local server
         QLocalServer server { &app };
 
@@ -143,6 +168,18 @@ int main(int argc, const char* argv[]) {
 
         QObject::connect(&server, &QLocalServer::newConnection, &app, &Application::handleLocalServerConnection);
 
+#ifdef HAS_BUGSPLAT
+        AccountManager& accountManager = AccountManager::getInstance();
+        mpSender.setDefaultUserName(qPrintable(accountManager.getAccountInfo().getUsername()));
+        QObject::connect(&accountManager, &AccountManager::usernameChanged, &app, [&mpSender](const QString& newUsername) {
+            mpSender.setDefaultUserName(qPrintable(newUsername));
+        });
+
+        // BugSplat WILL NOT work with file paths that do not use OS native separators.
+        auto logPath = QDir::toNativeSeparators(app.getLogger()->getFilename());
+        mpSender.sendAdditionalFile(qPrintable(logPath));
+#endif
+
         QTranslator translator;
         translator.load("i18n/interface_en");
         app.installTranslator(&translator);
@@ -155,5 +192,9 @@ int main(int argc, const char* argv[]) {
     Application::shutdownPlugins();
 
     qCDebug(interfaceapp, "Normal exit.");
+#ifndef DEBUG
+    // HACK: exit immediately (don't handle shutdown callbacks) for Release build
+    _exit(exitCode);
+#endif
     return exitCode;
 }

interface/src/octree/OctreePacketProcessor.cpp

@@ -56,7 +56,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
             memcpy(buffer.get(), message->getRawMessage() + statsMessageLength, piggybackBytes);
             
             auto newPacket = NLPacket::fromReceivedPacket(std::move(buffer), piggybackBytes, message->getSenderSockAddr());
-            message = QSharedPointer<ReceivedMessage>::create(*newPacket.release());
+            message = QSharedPointer<ReceivedMessage>::create(*newPacket);
         } else {
             // Note... stats packets don't have sequence numbers, so we don't want to send those to trackIncomingVoxelPacket()
             return; // bail since no piggyback data

interface/src/scripting/AssetMappingsScriptingInterface.cpp

@@ -0,0 +1,284 @@
+//
+//  AssetMappingsScriptingInterface.cpp
+//  libraries/script-engine/src
+//
+//  Created by Ryan Huffman on 2016-03-09.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "AssetMappingsScriptingInterface.h"
+
+#include <QtScript/QScriptEngine>
+#include <QtCore/QFile>
+
+#include <AssetRequest.h>
+#include <AssetUpload.h>
+#include <MappingRequest.h>
+#include <NetworkLogging.h>
+#include <OffscreenUi.h>
+
+AssetMappingsScriptingInterface::AssetMappingsScriptingInterface() {
+    _proxyModel.setSourceModel(&_assetMappingModel);
+    _proxyModel.setSortRole(Qt::DisplayRole);
+    _proxyModel.setDynamicSortFilter(true);
+    _proxyModel.sort(0);
+}
+
+void AssetMappingsScriptingInterface::setMapping(QString path, QString hash, QJSValue callback) {
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createSetMappingRequest(path, hash);
+
+    connect(request, &SetMappingRequest::finished, this, [this, callback](SetMappingRequest* request) mutable {
+        if (callback.isCallable()) {
+            QJSValueList args { request->getErrorString(), request->getPath() };
+            callback.call(args);
+        }
+
+        request->deleteLater();
+    });
+
+    request->start();
+}
+
+void AssetMappingsScriptingInterface::getMapping(QString path, QJSValue callback) {
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createGetMappingRequest(path);
+
+    connect(request, &GetMappingRequest::finished, this, [this, callback](GetMappingRequest* request) mutable {
+        if (callback.isCallable()) {
+            QJSValueList args { request->getErrorString() };
+            callback.call(args);
+        }
+
+        request->deleteLater();
+    });
+
+    request->start();
+}
+
+void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping, QJSValue startedCallback, QJSValue completedCallback, bool dropEvent) {
+    static const QString helpText =
+        "Upload your asset to a specific folder by entering the full path. Specifying\n"
+        "a new folder name will automatically create that folder for you.";
+    static const QString dropHelpText =
+        "This file will be added to your Asset Server.\n"
+        "Use the field below to place your file in a specific folder or to rename it.\n"
+        "Specifying a new folder name will automatically create that folder for you.";
+
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    auto result = offscreenUi->inputDialog(OffscreenUi::ICON_INFORMATION, "Specify Asset Path",
+                                           dropEvent ? dropHelpText : helpText, mapping);
+
+    if (!result.isValid()) {
+        completedCallback.call({ -1 });
+        return;
+    }
+    mapping = result.toString();
+    mapping = mapping.trimmed();
+
+    if (mapping[0] != '/') {
+        mapping = "/" + mapping;
+    }
+
+    // Check for override
+    if (isKnownMapping(mapping)) {
+        auto message = mapping + "\n" + "This file already exists. Do you want to overwrite it?";
+        auto button = offscreenUi->messageBox(OffscreenUi::ICON_QUESTION, "Overwrite File", message,
+                                              QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+        if (button == QMessageBox::No) {
+            completedCallback.call({ -1 });
+            return;
+        }
+    }
+
+    startedCallback.call();
+
+    auto upload = DependencyManager::get<AssetClient>()->createUpload(path);
+    QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
+        if (upload->getError() != AssetUpload::NoError) {
+            if (completedCallback.isCallable()) {
+                QJSValueList args { upload->getErrorString() };
+                completedCallback.call(args);
+            }
+        } else {
+            setMapping(mapping, hash, completedCallback);
+        }
+
+        upload->deleteLater();
+    });
+
+    upload->start();
+}
+
+void AssetMappingsScriptingInterface::deleteMappings(QStringList paths, QJSValue callback) {
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createDeleteMappingsRequest(paths);
+
+    connect(request, &DeleteMappingsRequest::finished, this, [this, callback](DeleteMappingsRequest* request) mutable {
+        if (callback.isCallable()) {
+            QJSValueList args { request->getErrorString() };
+            callback.call(args);
+        }
+
+        request->deleteLater();
+    });
+
+    request->start();
+}
+
+void AssetMappingsScriptingInterface::getAllMappings(QJSValue callback) {
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createGetAllMappingsRequest();
+
+    connect(request, &GetAllMappingsRequest::finished, this, [this, callback](GetAllMappingsRequest* request) mutable {
+        auto mappings = request->getMappings();
+        auto map = callback.engine()->newObject();
+
+        for (auto& kv : mappings ) {
+            map.setProperty(kv.first, kv.second);
+        }
+
+        if (callback.isCallable()) {
+            QJSValueList args { request->getErrorString(), map };
+            callback.call(args);
+        }
+
+        request->deleteLater();
+    });
+
+    request->start();
+}
+
+void AssetMappingsScriptingInterface::renameMapping(QString oldPath, QString newPath, QJSValue callback) {
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createRenameMappingRequest(oldPath, newPath);
+
+    connect(request, &RenameMappingRequest::finished, this, [this, callback](RenameMappingRequest* request) mutable {
+        if (callback.isCallable()) {
+            QJSValueList args { request->getErrorString() };
+            callback.call(args);
+        }
+
+        request->deleteLater();
+    });
+
+    request->start();
+}
+
+bool AssetMappingModel::isKnownFolder(QString path) const {
+    if (!path.endsWith("/")) {
+        return false;
+    }
+
+    auto existingPaths = _pathToItemMap.keys();
+    for (auto& entry : existingPaths) {
+        if (entry.startsWith(path)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+static int assetMappingModelMetatypeId = qRegisterMetaType<AssetMappingModel*>("AssetMappingModel*");
+
+void AssetMappingModel::refresh() {
+    qDebug() << "Refreshing asset mapping model";
+    auto assetClient = DependencyManager::get<AssetClient>();
+    auto request = assetClient->createGetAllMappingsRequest();
+
+    connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) mutable {
+        if (request->getError() == MappingRequest::NoError) {
+            auto mappings = request->getMappings();
+            auto existingPaths = _pathToItemMap.keys();
+            for (auto& mapping : mappings) {
+                auto& path = mapping.first;
+                auto parts = path.split("/");
+                auto length = parts.length();
+
+                existingPaths.removeOne(mapping.first);
+
+                QString fullPath = "/";
+
+                QStandardItem* lastItem = nullptr;
+
+                // start index at 1 to avoid empty string from leading slash
+                for (int i = 1; i < length; ++i) {
+                    fullPath += (i == 1 ? "" : "/") + parts[i];
+
+                    auto it = _pathToItemMap.find(fullPath);
+                    if (it == _pathToItemMap.end()) {
+                        auto item = new QStandardItem(parts[i]);
+                        bool isFolder = i < length - 1;
+                        item->setData(isFolder ? fullPath + "/" : fullPath, Qt::UserRole);
+                        item->setData(isFolder, Qt::UserRole + 1);
+                        item->setData(parts[i], Qt::UserRole + 2);
+                        item->setData("atp:" + fullPath, Qt::UserRole + 3);
+                        item->setData(fullPath, Qt::UserRole + 4);
+                        if (lastItem) {
+                            lastItem->setChild(lastItem->rowCount(), 0, item);
+                        } else {
+                            appendRow(item);
+                        }
+
+                        lastItem = item;
+                        _pathToItemMap[fullPath] = lastItem;
+                    } else {
+                        lastItem = it.value();
+                    }
+                }
+
+                Q_ASSERT(fullPath == path);
+            }
+
+            // Remove folders from list
+            auto it = existingPaths.begin();
+            while (it != existingPaths.end()) {
+                Q_ASSERT(_pathToItemMap.contains(*it));
+                auto item = _pathToItemMap[*it];
+                if (item && item->data(Qt::UserRole + 1).toBool()) {
+                    it = existingPaths.erase(it);
+                } else {
+                    ++it;
+                }
+            }
+
+            for (auto& path : existingPaths) {
+                Q_ASSERT(_pathToItemMap.contains(path));
+
+                auto item = _pathToItemMap[path];
+
+                while (item) {
+                    // During each iteration, delete item
+                    QStandardItem* nextItem = nullptr;
+
+                    auto fullPath = item->data(Qt::UserRole + 4).toString();
+                    auto parent = item->parent();
+                    if (parent) {
+                        parent->removeRow(item->row());
+                        if (parent->rowCount() > 0) {
+                            // The parent still contains children, set the nextItem to null so we stop processing
+                            nextItem = nullptr;
+                        } else {
+                            nextItem = parent;
+                        }
+                    } else {
+                        auto removed = removeRow(item->row());
+                        Q_ASSERT(removed);
+                    }
+
+                    Q_ASSERT(_pathToItemMap.contains(fullPath));
+                    _pathToItemMap.remove(fullPath);
+
+                    item = nextItem;
+                }
+            }
+        } else {
+            emit errorGettingMappings(request->getErrorString());
+        }
+    });
+
+    request->start();
+}

interface/src/scripting/AssetMappingsScriptingInterface.h

@@ -0,0 +1,70 @@
+//
+//  AssetMappingsScriptingInterface.h
+//  libraries/script-engine/src
+//
+//  Created by Ryan Huffman on 2016-03-09.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#pragma once
+
+#ifndef hifi_AssetMappingsScriptingInterface_h
+#define hifi_AssetMappingsScriptingInterface_h
+
+#include <QtCore/QObject>
+#include <QtScript/QScriptValue>
+
+#include <AssetClient.h>
+#include <QSortFilterProxyModel>
+
+
+
+class AssetMappingModel : public QStandardItemModel {
+    Q_OBJECT
+public:
+    Q_INVOKABLE void refresh();
+
+    bool isKnownMapping(QString path) const { return _pathToItemMap.contains(path); }
+    bool isKnownFolder(QString path) const;
+
+signals:
+    void errorGettingMappings(QString errorString);
+
+private:
+    QHash<QString, QStandardItem*> _pathToItemMap;
+};
+
+Q_DECLARE_METATYPE(AssetMappingModel*);
+
+class AssetMappingsScriptingInterface : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(AssetMappingModel* mappingModel READ getAssetMappingModel CONSTANT)
+    Q_PROPERTY(QAbstractProxyModel* proxyModel READ getProxyModel CONSTANT)
+public:
+    AssetMappingsScriptingInterface();
+
+    Q_INVOKABLE AssetMappingModel* getAssetMappingModel() { return &_assetMappingModel; }
+    Q_INVOKABLE QAbstractProxyModel* getProxyModel() { return &_proxyModel; }
+
+    Q_INVOKABLE bool isKnownMapping(QString path) const { return _assetMappingModel.isKnownMapping(path); }
+    Q_INVOKABLE bool isKnownFolder(QString path) const { return _assetMappingModel.isKnownFolder(path); }
+
+    Q_INVOKABLE void setMapping(QString path, QString hash, QJSValue callback = QJSValue());
+    Q_INVOKABLE void getMapping(QString path, QJSValue callback = QJSValue());
+    Q_INVOKABLE void uploadFile(QString path, QString mapping, QJSValue startedCallback = QJSValue(), QJSValue completedCallback = QJSValue(), bool dropEvent = false);
+    Q_INVOKABLE void deleteMappings(QStringList paths, QJSValue callback);
+    Q_INVOKABLE void deleteMapping(QString path, QJSValue callback) { deleteMappings(QStringList(path), callback = QJSValue()); }
+    Q_INVOKABLE void getAllMappings(QJSValue callback = QJSValue());
+    Q_INVOKABLE void renameMapping(QString oldPath, QString newPath, QJSValue callback = QJSValue());
+
+protected:
+    QSet<AssetRequest*> _pendingRequests;
+    AssetMappingModel _assetMappingModel;
+    QSortFilterProxyModel _proxyModel;
+};
+
+
+#endif // hifi_AssetMappingsScriptingInterface_h

interface/src/scripting/WindowScriptingInterface.cpp

@@ -9,6 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <QClipboard>
 #include <QtCore/QDir>
 #include <QMessageBox>
 #include <QScriptValue>
@@ -139,3 +140,8 @@ int WindowScriptingInterface::getX() {
 int WindowScriptingInterface::getY() {
     return qApp->getWindow()->y();
 }
+
+void WindowScriptingInterface::copyToClipboard(const QString& text) {
+    qDebug() << "Copying";
+    QApplication::clipboard()->setText(text);
+}

interface/src/scripting/WindowScriptingInterface.h

@@ -40,6 +40,7 @@ public slots:
     QScriptValue prompt(const QString& message = "", const QString& defaultText = "");
     QScriptValue browse(const QString& title = "", const QString& directory = "",  const QString& nameFilter = "");
     QScriptValue save(const QString& title = "", const QString& directory = "",  const QString& nameFilter = "");
+    void copyToClipboard(const QString& text);
 
 signals:
     void domainChanged(const QString& domainHostname);

interface/src/ui/AssetUploadDialogFactory.cpp

@@ -1,151 +0,0 @@
-//
-//  AssetUploadDialogFactory.cpp
-//  interface/src/ui
-//
-//  Created by Stephen Birarda on 2015-08-26.
-//  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
-//
-
-#include "AssetUploadDialogFactory.h"
-
-#include <QtCore/QDebug>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QVBoxLayout>
-
-#include <AssetClient.h>
-#include <AssetUpload.h>
-#include <AssetUtils.h>
-#include <NodeList.h>
-#include <OffscreenUi.h>
-#include <ResourceManager.h>
-
-AssetUploadDialogFactory& AssetUploadDialogFactory::getInstance() {
-    static AssetUploadDialogFactory staticInstance;
-    return staticInstance;
-}
-
-
-
-void AssetUploadDialogFactory::showDialog() {
-    auto nodeList = DependencyManager::get<NodeList>();
-    
-    if (nodeList->getThisNodeCanRez()) {
-        auto filename = QFileDialog::getOpenFileName(_dialogParent, "Select a file to upload");
-        
-        if (!filename.isEmpty()) {
-            qDebug() << "Selected filename for upload to asset-server: " << filename;
-            
-            auto assetClient = DependencyManager::get<AssetClient>();
-            auto upload = assetClient->createUpload(filename);
-            
-            if (upload) {
-                // connect to the finished signal so we know when the AssetUpload is done
-                QObject::connect(upload, &AssetUpload::finished, this, &AssetUploadDialogFactory::handleUploadFinished);
-                
-                // start the upload now
-                upload->start();
-            } else {
-                // show a QMessageBox to say that there is no local asset server
-                QString messageBoxText = QString("Could not upload \n\n%1\n\nbecause you are currently not connected" \
-                                                 " to a local asset-server.").arg(QFileInfo(filename).fileName());
-                
-                QMessageBox::information(_dialogParent, "Failed to Upload", messageBoxText);
-            }
-        }
-    } else {
-        // we don't have permission to upload to asset server in this domain - show the permission denied error
-        showErrorDialog(nullptr, _dialogParent, AssetUpload::PERMISSION_DENIED_ERROR);
-    }
-    
-}
-
-void AssetUploadDialogFactory::handleUploadFinished(AssetUpload* upload, const QString& hash) {
-    if (upload->getError() == AssetUpload::NoError) {
-        // show message box for successful upload, with copiable text for ATP hash
-        QDialog* hashCopyDialog = new QDialog(_dialogParent);
-        
-        // delete the dialog on close
-        hashCopyDialog->setAttribute(Qt::WA_DeleteOnClose);
-        
-        // set the window title
-        hashCopyDialog->setWindowTitle(tr("Successful Asset Upload"));
-        
-        // setup a layout for the contents of the dialog
-        QVBoxLayout* boxLayout = new QVBoxLayout;
-        
-        // set the label text (this shows above the text box)
-        QLabel* lineEditLabel = new QLabel;
-        lineEditLabel->setText(QString("ATP URL for %1").arg(QFileInfo(upload->getFilename()).fileName()));
-        
-        // setup the line edit to hold the copiable text
-        QLineEdit* lineEdit = new QLineEdit;
-       
-        QString atpURL = QString("%1:%2.%3").arg(URL_SCHEME_ATP).arg(hash).arg(upload->getExtension());
-        
-        // set the ATP URL as the text value so it's copiable
-        lineEdit->insert(atpURL);
-        
-        // figure out what size this line edit should be using font metrics
-        QFontMetrics textMetrics { lineEdit->font() };
-        
-        // set the fixed width on the line edit
-        // pad it by 10 to cover the border and some extra space on the right side (for clicking)
-        static const int LINE_EDIT_RIGHT_PADDING { 10 };
-        
-        lineEdit->setFixedWidth(textMetrics.width(atpURL) + LINE_EDIT_RIGHT_PADDING );
-        
-        // left align the ATP URL line edit
-        lineEdit->home(true);
-        
-        // add the label and line edit to the dialog
-        boxLayout->addWidget(lineEditLabel);
-        boxLayout->addWidget(lineEdit);
-        
-        // setup an OK button to close the dialog
-        QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
-        connect(buttonBox, &QDialogButtonBox::accepted, hashCopyDialog, &QDialog::close);
-        boxLayout->addWidget(buttonBox);
-        
-        // set the new layout on the dialog
-        hashCopyDialog->setLayout(boxLayout);
-        
-        // show the new dialog
-        hashCopyDialog->show();
-    } else {
-        // display a message box with the error
-        showErrorDialog(upload, _dialogParent);
-    }
-    
-    upload->deleteLater();
-}
-
-void AssetUploadDialogFactory::showErrorDialog(AssetUpload* upload, QWidget* dialogParent, const QString& overrideMessage) {
-    QString filename;
-    
-    if (upload) {
-        filename = QFileInfo { upload->getFilename() }.fileName();
-    }
-    
-    QString errorMessage = overrideMessage;
-    
-    if (errorMessage.isEmpty() && upload) {
-        errorMessage = upload->getErrorString();
-    }
-    
-    QString dialogMessage;
-    
-    if (upload) {
-        dialogMessage += QString("Failed to upload %1.\n\n").arg(filename);
-    }
-    
-    dialogMessage += errorMessage;
-    
-    OffscreenUi::warning(dialogParent, "Failed Upload", dialogMessage);
-}

interface/src/ui/AssetUploadDialogFactory.h

@@ -1,44 +0,0 @@
-//
-//  AssetUploadDialogFactory.h
-//  interface/src/ui
-//
-//  Created by Stephen Birarda on 2015-08-26.
-//  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
-//
-
-#pragma once
-
-#ifndef hifi_AssetUploadDialogFactory_h
-#define hifi_AssetUploadDialogFactory_h
-
-#include <QtCore/QObject>
-
-class AssetUpload;
-
-class AssetUploadDialogFactory : public QObject {
-    Q_OBJECT
-public:
-    AssetUploadDialogFactory(const AssetUploadDialogFactory& other) = delete;
-    AssetUploadDialogFactory& operator=(const AssetUploadDialogFactory& rhs) = delete;
-    
-    static AssetUploadDialogFactory& getInstance();
-    static void showErrorDialog(AssetUpload* upload, QWidget* dialogParent, const QString& overrideMessage = QString());
-    
-    void setDialogParent(QWidget* dialogParent) { _dialogParent = dialogParent; }
-    
-public slots:
-    void showDialog();
-    void handleUploadFinished(AssetUpload* upload, const QString& hash);
-    
-private:
-    AssetUploadDialogFactory() = default;
-    
-    
-    
-    QWidget* _dialogParent { nullptr };
-};
-
-#endif // hifi_AssetUploadDialogFactory_h

interface/src/ui/DialogsManager.cpp

@@ -143,7 +143,9 @@ void DialogsManager::hmdTools(bool showTools) {
 }
 
 void DialogsManager::hmdToolsClosed() {
-    _hmdToolsDialog->hide();
+    if (_hmdToolsDialog) {
+        _hmdToolsDialog->hide();
+    }
 }
 
 void DialogsManager::showScriptEditor() {

interface/src/ui/ScriptEditorWidget.cpp

@@ -223,21 +223,31 @@ bool ScriptEditorWidget::questionSave() {
 void ScriptEditorWidget::onWindowActivated() {
     if (!_isReloading) {
         _isReloading = true;
-        
-        if (QFileInfo(_currentScript).lastModified() > _currentScriptModified) {
-            if (static_cast<ScriptEditorWindow*>(this->parent()->parent()->parent())->autoReloadScripts()
-                || OffscreenUi::warning(this, _currentScript,
-                    tr("This file has been modified outside of the Interface editor.") + "\n\n"
+
+        QDateTime fileStamp = QFileInfo(_currentScript).lastModified();
+        if (fileStamp > _currentScriptModified) {
+            bool doReload = false;
+            auto window = static_cast<ScriptEditorWindow*>(this->parent()->parent()->parent());
+            window->inModalDialog = true;
+            if (window->autoReloadScripts()
+                || OffscreenUi::question(this, tr("Reload Script"),
+                    tr("The following file has been modified outside of the Interface editor:") + "\n" + _currentScript + "\n"
                         + (isModified()
                         ? tr("Do you want to reload it and lose the changes you've made in the Interface editor?")
                         : tr("Do you want to reload it?")),
                     QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+                doReload = true;
+            }
+            window->inModalDialog = false;
+            if (doReload) {
                 loadFile(_currentScript);
                 if (_scriptEditorWidgetUI->onTheFlyCheckBox->isChecked() && isRunning()) {
                     _isRestarting = true;
                     setRunning(false);
                     // Script is restarted once current script instance finishes.
                 }
+            } else {
+                _currentScriptModified = fileStamp; // Asked and answered. Don't ask again until the external file is changed again.
             }
         }
         _isReloading = false;

interface/src/ui/ScriptEditorWindow.cpp

@@ -171,6 +171,9 @@ void ScriptEditorWindow::tabSwitched(int tabIndex) {
 }
 
 void ScriptEditorWindow::tabCloseRequested(int tabIndex) {
+    if (ignoreCloseForModal(nullptr)) {
+        return;
+    }
     ScriptEditorWidget* closingScriptWidget = static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget
                                                                                ->widget(tabIndex));
     if(closingScriptWidget->questionSave()) {
@@ -178,7 +181,26 @@ void ScriptEditorWindow::tabCloseRequested(int tabIndex) {
     }
 }
 
+// If this operating system window causes a qml overlay modal dialog (which might not even be seen by the user), closing this window
+// will crash the code that was waiting on the dialog result. So that code whousl set inModalDialog to true while the question is up.
+// This code will not be necessary when switch out all operating system windows for qml overlays.
+bool ScriptEditorWindow::ignoreCloseForModal(QCloseEvent* event) {
+    if (!inModalDialog) {
+        return false;
+    }
+    // Deliberately not using OffscreenUi, so that the dialog is seen.
+    QMessageBox::information(this, tr("Interface"), tr("There is a modal dialog that must be answered before closing."),
+                             QMessageBox::Discard, QMessageBox::Discard);
+    if (event) {
+        event->ignore(); // don't close
+    }
+    return true;
+}
+
 void ScriptEditorWindow::closeEvent(QCloseEvent *event) {
+    if (ignoreCloseForModal(event)) {
+        return;
+    }
     bool unsaved_docs_warning = false;
     for (int i = 0; i < _ScriptEditorWindowUI->tabWidget->count(); i++){
         if(static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget->widget(i))->isModified()){

interface/src/ui/ScriptEditorWindow.h

@@ -28,6 +28,9 @@ public:
     void terminateCurrentTab();
     bool autoReloadScripts();
 
+    bool inModalDialog { false };
+    bool ignoreCloseForModal(QCloseEvent* event);
+
 signals:
     void windowActivated();
 

interface/src/ui/Stats.cpp

@@ -156,7 +156,7 @@ void Stats::updateStats(bool force) {
             }
         }
     });
-    
+
     // update the entities ping with the average for all connected entity servers
     STAT_UPDATE(entitiesPing, octreeServerCount ? totalPingOctree / octreeServerCount : -1);
 
@@ -192,9 +192,29 @@ void Stats::updateStats(bool force) {
             STAT_UPDATE(audioMixerPps, -1);
         }
 
-        STAT_UPDATE(downloads, ResourceCache::getLoadingRequests().size());
+        QList<Resource*> loadingRequests = ResourceCache::getLoadingRequests();
+        STAT_UPDATE(downloads, loadingRequests.size());
         STAT_UPDATE(downloadLimit, ResourceCache::getRequestLimit())
         STAT_UPDATE(downloadsPending, ResourceCache::getPendingRequestCount());
+
+        // See if the active download urls have changed
+        bool shouldUpdateUrls = _downloads != _downloadUrls.size();
+        if (!shouldUpdateUrls) {
+            for (int i = 0; i < _downloads; i++) {
+                if (loadingRequests[i]->getURL().toString() != _downloadUrls[i]) {
+                    shouldUpdateUrls = true;
+                    break;
+                }
+            }
+        }
+        // If the urls have changed, update the list
+        if (shouldUpdateUrls) {
+            _downloadUrls.clear();
+            foreach (Resource* resource, loadingRequests) {
+                _downloadUrls << resource->getURL().toString();
+            }
+            emit downloadUrlsChanged();
+        }
         // TODO fix to match original behavior
         //stringstream downloads;
         //downloads << "Downloads: ";
@@ -306,7 +326,7 @@ void Stats::updateStats(bool force) {
         // we will also include room for 1 line per timing record and a header of 4 lines
         // Timing details...
 
-        // First iterate all the records, and for the ones that should be included, insert them into 
+        // First iterate all the records, and for the ones that should be included, insert them into
         // a new Map sorted by average time...
         bool onlyDisplayTopTen = Menu::getInstance()->isOptionChecked(MenuOption::OnlyDisplayTopTen);
         QMap<float, QString> sortedRecords;
@@ -366,7 +386,7 @@ void Stats::setRenderDetails(const RenderDetails& details) {
 /*
 // display expanded or contracted stats
 void Stats::display(
-        int voxelPacketsToProcess) 
+        int voxelPacketsToProcess)
 {
     // iterate all the current voxel stats, and list their sending modes, and total voxel counts
 

interface/src/ui/Stats.h

@@ -19,7 +19,7 @@
 public: \
     type name() { return _##name; }; \
 private: \
-    type _##name{ initialValue }; 
+    type _##name{ initialValue };
 
 
 class Stats : public QQuickItem {
@@ -58,6 +58,7 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(int, downloads, 0)
     STATS_PROPERTY(int, downloadLimit, 0)
     STATS_PROPERTY(int, downloadsPending, 0)
+    Q_PROPERTY(QStringList downloadUrls READ downloadUrls NOTIFY downloadUrlsChanged)
     STATS_PROPERTY(int, triangles, 0)
     STATS_PROPERTY(int, quads, 0)
     STATS_PROPERTY(int, materialSwitches, 0)
@@ -105,6 +106,8 @@ public:
         }
     }
 
+    QStringList downloadUrls () { return _downloadUrls; }
+
 public slots:
     void forceUpdateStats() { updateStats(true); }
 
@@ -138,6 +141,7 @@ signals:
     void downloadsChanged();
     void downloadLimitChanged();
     void downloadsPendingChanged();
+    void downloadUrlsChanged();
     void trianglesChanged();
     void quadsChanged();
     void materialSwitchesChanged();
@@ -167,6 +171,7 @@ private:
     bool _timingExpanded{ false };
     QString _monospaceFont;
     const AudioIOStats* _audioStats;
+    QStringList _downloadUrls = QStringList();
 };
 
 #endif // hifi_Stats_h

libraries/animation/src/AnimClip.cpp

@@ -13,7 +13,7 @@
 #include "AnimationLogging.h"
 #include "AnimUtil.h"
 
-bool AnimClip::usePreAndPostPoseFromAnim = false;
+bool AnimClip::usePreAndPostPoseFromAnim = true;
 
 AnimClip::AnimClip(const QString& id, const QString& url, float startFrame, float endFrame, float timeScale, bool loopFlag, bool mirrorFlag) :
     AnimNode(AnimNode::Type::Clip, id),

libraries/animation/src/AnimInverseKinematics.cpp

@@ -481,7 +481,7 @@ const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars
 
             // smooth transitions by relaxing _hipsOffset toward the new value
             const float HIPS_OFFSET_SLAVE_TIMESCALE = 0.15f;
-            float tau = dt > HIPS_OFFSET_SLAVE_TIMESCALE ? 1.0f : dt / HIPS_OFFSET_SLAVE_TIMESCALE;
+            float tau = dt < HIPS_OFFSET_SLAVE_TIMESCALE ?  dt / HIPS_OFFSET_SLAVE_TIMESCALE : 1.0f;
             _hipsOffset += (newHipsOffset - _hipsOffset) * tau;
         }
     }

libraries/animation/src/AnimNodeLoader.cpp

@@ -611,7 +611,7 @@ AnimNode::Pointer AnimNodeLoader::load(const QByteArray& contents, const QUrl& j
     return loadNode(rootVal.toObject(), jsonUrl);
 }
 
-void AnimNodeLoader::onRequestDone(const QByteArray& data) {
+void AnimNodeLoader::onRequestDone(const QByteArray data) {
     auto node = load(data, _url);
     if (node) {
         emit success(node);

libraries/animation/src/AnimNodeLoader.h

@@ -36,7 +36,7 @@ protected:
     static AnimNode::Pointer load(const QByteArray& contents, const QUrl& jsonUrl);
 
 protected slots:
-    void onRequestDone(const QByteArray& data);
+    void onRequestDone(const QByteArray data);
     void onRequestError(QNetworkReply::NetworkError error);
 
 protected: