From 4ba9b0812511115ca95103a554adab79c6b78df5 Mon Sep 17 00:00:00 2001 From: Liv Date: Thu, 20 Jul 2017 14:00:51 -0700 Subject: [PATCH] first attempt at url handling in octree server --- assignment-client/src/octree/OctreeServer.cpp | 3 ++- domain-server/src/DomainServer.cpp | 2 +- libraries/entities/src/EntityScriptingInterface.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index ee3d0ca0e6..9507f3be3b 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -965,7 +965,8 @@ void OctreeServer::handleOctreeFileReplacement(QSharedPointer m } else { qWarning() << "Could not write replacement octree data to file - refusing to process"; } - } else { + } + else { qDebug() << "Received replacement octree file that is invalid - refusing to process"; } } else { diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index c5171620de..18169aaf67 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -2850,4 +2850,4 @@ void DomainServer::handleOctreeFileReplacement(QByteArray octreeFile) { limitedNodeList->sendPacketList(std::move(octreeFilePacketList), *octreeNode); }); -} +} \ No newline at end of file diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 3f639cb17c..4e9a0e83f5 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -1166,7 +1166,7 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID, } void EntityScriptingInterface::replaceDomainContentSet(const QString url){ - + } QUuid EntityScriptingInterface::addAction(const QString& actionTypeString,