Merge pull request #12509 from huffman/feat/content-settings

Fix entity data not being stored when Id and DataVersion are null
This commit is contained in:
Ryan Huffman 2018-02-27 08:43:44 -08:00 committed by GitHub
commit 44f3b00a92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1187,7 +1187,7 @@ void OctreeServer::handleOctreeDataFileReply(QSharedPointer<ReceivedMessage> mes
} else {
qDebug() << "Got reply to octree data file request, current entity data is sufficient";
OctreeUtils::RawOctreeData data;
OctreeUtils::RawEntityData data;
qCDebug(octree_server) << "Reading octree data from" << _persistAbsoluteFilePath;
if (data.readOctreeDataInfoFromFile(_persistAbsoluteFilePath)) {
if (data.id.isNull()) {