From 6f442a74b1cbc7355717ce3cc6a52ede5b8689fc Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 10 Nov 2016 14:43:15 -0800
Subject: [PATCH] request settings from agents and debug results

---
 .../resources/describe-settings.json          |  1 +
 interface/src/avatar/MyAvatar.cpp             |  3 ++
 libraries/networking/src/DomainHandler.cpp    | 32 +++++++------------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index b5c612881f..77a33b4d56 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -869,6 +869,7 @@
     {
       "name": "avatars",
       "label": "Avatars",
+      "assignment-types": [1, 2],
       "settings": [
         {
           "name": "min_avatar_scale",
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index e1f0bd3a68..48b6e7c53c 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1893,6 +1893,9 @@ void MyAvatar::restrictScaleFromDomainSettings(const QJsonObject& domainSettings
     float settingMaxScale = avatarsObject[MAX_SCALE_OPTION].toDouble(MAX_AVATAR_SCALE);
     setDomainMaximumScale(settingMaxScale);
 
+    qCDebug(interfaceapp, "This domain requires a minimum avatar scale of %f and a maximum avatar scale of %f",
+            _domainMinimumScale, _domainMaximumScale);
+
     // debug to log if this avatar's scale in this domain will be clamped
     auto clampedScale = glm::clamp(_targetScale, _domainMinimumScale, _domainMaximumScale);
 
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index eecc1515f5..5d7340b2ce 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -272,27 +272,17 @@ void DomainHandler::setIsConnected(bool isConnected) {
 }
 
 void DomainHandler::requestDomainSettings() {
-    // TODO: the nodes basically lock if they don't get a response - add a timeout to this so that they at least restart
-    // if they can't get settings
-    
-    NodeType_t owningNodeType = DependencyManager::get<NodeList>()->getOwnerType();
-    if (owningNodeType == NodeType::Agent) {
-        // for now the agent nodes don't need any domain settings
-        _settingsObject = QJsonObject();
-        emit settingsReceived(_settingsObject);
-    } else {
-        qCDebug(networking) << "Requesting settings from domain server";
-        
-        Assignment::Type assignmentType = Assignment::typeForNodeType(DependencyManager::get<NodeList>()->getOwnerType());
-        
-        auto packet = NLPacket::create(PacketType::DomainSettingsRequest, sizeof(assignmentType), true, false);
-        packet->writePrimitive(assignmentType);
-        
-        auto nodeList = DependencyManager::get<LimitedNodeList>();
-        nodeList->sendPacket(std::move(packet), _sockAddr);
-        
-        _settingsTimer.start();
-    }
+    qCDebug(networking) << "Requesting settings from domain server";
+
+    Assignment::Type assignmentType = Assignment::typeForNodeType(DependencyManager::get<NodeList>()->getOwnerType());
+
+    auto packet = NLPacket::create(PacketType::DomainSettingsRequest, sizeof(assignmentType), true, false);
+    packet->writePrimitive(assignmentType);
+
+    auto nodeList = DependencyManager::get<LimitedNodeList>();
+    nodeList->sendPacket(std::move(packet), _sockAddr);
+
+    _settingsTimer.start();
 }
 
 void DomainHandler::processSettingsPacketList(QSharedPointer<ReceivedMessage> packetList) {