Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll

interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml

@@ -163,7 +163,6 @@ Item {
 
             Rectangle {
                 id: contextCard;
-                z: 2;
                 anchors.left: parent.left;
                 anchors.leftMargin: 30;
                 anchors.top: parent.top;
@@ -337,7 +336,6 @@ Item {
 
             Rectangle {
                 id: permissionExplanationCard;
-                z: 1;
                 anchors.left: parent.left;
                 anchors.leftMargin: 30;
                 anchors.top: parent.top;
@@ -596,8 +594,8 @@ Item {
                 anchors.fill: parent;
                 hoverEnabled: enabled;
                 onClicked: {
-                    contextCard.z = 1;
+                    contextCard.visible = true;
-                    permissionExplanationCard.z = 0;
+                    permissionExplanationCard.visible = false;
                     root.sendToPurchases({ method: 'flipCard' });
                 }
                 onEntered: {
@@ -779,8 +777,8 @@ Item {
                     noPermissionGlyph.color = hifi.colors.redAccent;
                 }
                 onClicked: {
-                    contextCard.z = 0;
+                    contextCard.visible = false;
-                    permissionExplanationCard.z = 1;
+                    permissionExplanationCard.visible = true;
                     root.sendToPurchases({ method: 'flipCard' });
                 }
             }

interface/src/commerce/Wallet.cpp

@@ -314,6 +314,7 @@ Wallet::Wallet() {
     auto nodeList = DependencyManager::get<NodeList>();
     auto ledger = DependencyManager::get<Ledger>();
     auto& packetReceiver = nodeList->getPacketReceiver();
+    _passphrase = new QString("");
 
     packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "handleChallengeOwnershipPacket");
     packetReceiver.registerListener(PacketType::ChallengeOwnershipRequest, this, "handleChallengeOwnershipPacket");
@@ -365,6 +366,10 @@ Wallet::~Wallet() {
     if (_securityImage) {
         delete _securityImage;
     }
+
+    if (_passphrase) {
+        delete _passphrase;
+    }
 }
 
 bool Wallet::setPassphrase(const QString& passphrase) {

interface/src/commerce/Wallet.h

@@ -78,7 +78,7 @@ private:
     QByteArray _salt;
     QByteArray _iv;
     QByteArray _ckey;
-    QString* _passphrase { new QString("") };
+    QString* _passphrase { nullptr };
     bool _isOverridingServer { false };
 
     bool writeWallet(const QString& newPassphrase = QString(""));

libraries/octree/src/OctreeDataUtils.cpp

@@ -40,9 +40,10 @@ bool readOctreeFile(QString path, QJsonDocument* doc) {
 }
 
 bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromJSON(QJsonObject root) {
-    if (root.contains("Id") && root.contains("DataVersion")) {
+    if (root.contains("Id") && root.contains("DataVersion") && root.contains("Version")) {
         id = root["Id"].toVariant().toUuid();
-        version = root["DataVersion"].toInt();
+        dataVersion = root["DataVersion"].toInt();
+        version = root["Version"].toInt();
     }
     readSubclassData(root);
     return true;
@@ -76,11 +77,10 @@ bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromFile(QString path) {
 }
 
 QByteArray OctreeUtils::RawOctreeData::toByteArray() {
-    const auto protocolVersion = (int)versionForPacketType((PacketTypeEnum::Value)dataPacketType());
     QJsonObject obj {
-        { "DataVersion", QJsonValue((qint64)version) },
+        { "DataVersion", QJsonValue((qint64)dataVersion) },
         { "Id", QJsonValue(id.toString()) },
-        { "Version", protocolVersion },
+        { "Version", QJsonValue((qint64)version) },
     };
 
     writeSubclassData(obj);
@@ -111,8 +111,8 @@ PacketType OctreeUtils::RawOctreeData::dataPacketType() const {
 
 void OctreeUtils::RawOctreeData::resetIdAndVersion() {
     id = QUuid::createUuid();
-    version = OctreeUtils::INITIAL_VERSION;
+    dataVersion = OctreeUtils::INITIAL_VERSION;
-    qDebug() << "Reset octree data to: " << id << version;
+    qDebug() << "Reset octree data to: " << id << dataVersion;
 }
 
 void OctreeUtils::RawEntityData::readSubclassData(const QJsonObject& root) {

libraries/octree/src/OctreeDataUtils.h

@@ -28,6 +28,7 @@ constexpr Version INITIAL_VERSION = 0;
 class RawOctreeData {
 public:
     QUuid id { QUuid() };
+    Version dataVersion { -1 };
     Version version { -1 };
 
     virtual PacketType dataPacketType() const;

libraries/octree/src/OctreePersistThread.cpp

@@ -179,8 +179,8 @@ bool OctreePersistThread::process() {
 
         OctreeUtils::RawOctreeData data;
         if (data.readOctreeDataInfoFromFile(_filename)) {
-            qDebug() << "Setting entity version info to: " << data.id << data.version;
+            qDebug() << "Setting entity version info to: " << data.id << data.dataVersion;
-            _tree->setOctreeVersionInfo(data.id, data.version);
+            _tree->setOctreeVersionInfo(data.id, data.dataVersion);
         }
 
         bool persistentFileRead;

plugins/hifiSdl2/src/SDL2Manager.cpp

@@ -47,7 +47,7 @@ static_assert(
 const char* SDL2Manager::NAME = "SDL2";
 const char* SDL2Manager::SDL2_ID_STRING = "SDL2";
 
-const bool DEFAULT_ENABLED = false;
+const bool DEFAULT_ENABLED = true;
 
 SDL_JoystickID SDL2Manager::getInstanceId(SDL_GameController* controller) {
     SDL_Joystick* joystick = SDL_GameControllerGetJoystick(controller);

scripts/system/snapshot.js

@@ -295,6 +295,7 @@ function printToPolaroid(image_url) {
         "description": "Printed from Snaps",                               
         "modelURL": POLAROID_MODEL_URL,
 
+        "dimensions": { "x": 0.5667, "y": 0.0212, "z": 0.4176 },
         "position": model_pos,
         "rotation": model_rot,