From 0b080471ff975c89d7108844f554527caa900ef7 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Tue, 26 Feb 2019 10:57:35 -0800 Subject: [PATCH] Filter on scriptValue to reduce EntityItem load; bump ping timeouts for testing --- assignment-client/src/avatars/AvatarMixer.cpp | 2 +- libraries/networking/src/DomainHandler.h | 2 +- libraries/networking/src/ThreadedAssignment.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index f352e02afa..df89194247 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -957,7 +957,7 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) { } void AvatarMixer::setupEntityQuery() { - static char queryJsonString[] = R"({"avatarPriority": true})"; + static char queryJsonString[] = R"({"avatarPriority": true, "serverScripts": "+"})"; _entityViewer.init(); DependencyManager::registerInheritance(); diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h index 620ffb9641..219af3338c 100644 --- a/libraries/networking/src/DomainHandler.h +++ b/libraries/networking/src/DomainHandler.h @@ -35,7 +35,7 @@ const unsigned short DEFAULT_DOMAIN_SERVER_DTLS_PORT = 40103; const quint16 DOMAIN_SERVER_HTTP_PORT = 40100; const quint16 DOMAIN_SERVER_HTTPS_PORT = 40101; -const int MAX_SILENT_DOMAIN_SERVER_CHECK_INS = 5; +const int MAX_SILENT_DOMAIN_SERVER_CHECK_INS = 10; // XXX class DomainHandler : public QObject { Q_OBJECT diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp index bdba47f0ed..62aec4a2a1 100644 --- a/libraries/networking/src/ThreadedAssignment.cpp +++ b/libraries/networking/src/ThreadedAssignment.cpp @@ -123,6 +123,7 @@ void ThreadedAssignment::checkInWithDomainServerOrExit() { // increase the number of queued check ins _numQueuedCheckIns++; + qCDebug(networking) << "Number of queued checkins = " << _numQueuedCheckIns; } }