From 6979135fe3999f84700d469bb3ded291c1d1fc31 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 22 Jan 2014 16:23:24 -0800
Subject: [PATCH] move some of the node interest additions to correct spots

---
 assignment-client/src/Agent.cpp                         | 6 +-----
 libraries/octree-server/src/OctreeServer.cpp            | 2 +-
 libraries/particles/src/ParticlesScriptingInterface.cpp | 1 +
 libraries/voxel-server/src/VoxelServer.cpp              | 2 ++
 libraries/voxels/src/VoxelsScriptingInterface.cpp       | 4 ++++
 libraries/voxels/src/VoxelsScriptingInterface.h         | 2 ++
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 3584dd9f5d..4f81c42046 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -52,11 +52,7 @@ void Agent::run() {
     NodeList* nodeList = NodeList::getInstance();
     nodeList->setOwnerType(NODE_TYPE_AGENT);
     
-    // XXXBHG - this seems less than ideal. There might be classes (like jurisdiction listeners, that need access to
-    // other node types, but for them to get access to those node types, we have to add them here. It seems like 
-    // NodeList should support adding types of interest
-    nodeList->addSetOfNodeTypesToNodeInterestSet(QSet<NODE_TYPE>() << NODE_TYPE_VOXEL_SERVER << NODE_TYPE_PARTICLE_SERVER
-                                                 << NODE_TYPE_AUDIO_MIXER << NODE_TYPE_AVATAR_MIXER);
+    nodeList->addSetOfNodeTypesToNodeInterestSet(QSet<NODE_TYPE>() << NODE_TYPE_AUDIO_MIXER << NODE_TYPE_AVATAR_MIXER);
     
     // figure out the URL for the script for this agent assignment
     QString scriptURLString("http://%1:8080/assignment/%2");
diff --git a/libraries/octree-server/src/OctreeServer.cpp b/libraries/octree-server/src/OctreeServer.cpp
index 64f19700a8..cc362f58a0 100644
--- a/libraries/octree-server/src/OctreeServer.cpp
+++ b/libraries/octree-server/src/OctreeServer.cpp
@@ -569,7 +569,7 @@ void OctreeServer::run() {
     nodeList->setOwnerType(getMyNodeType());
 
     // we need to ask the DS about agents so we can ping/reply with them
-    nodeList->addSetOfNodeTypesToNodeInterestSet(QSet<NODE_TYPE>() << NODE_TYPE_AGENT << NODE_TYPE_ANIMATION_SERVER);
+    nodeList->addNodeTypeToInterestSet(NODE_TYPE_AGENT);
 
     setvbuf(stdout, NULL, _IOLBF, 0);
 
diff --git a/libraries/particles/src/ParticlesScriptingInterface.cpp b/libraries/particles/src/ParticlesScriptingInterface.cpp
index 14388b6ac4..d52ed5ba13 100644
--- a/libraries/particles/src/ParticlesScriptingInterface.cpp
+++ b/libraries/particles/src/ParticlesScriptingInterface.cpp
@@ -13,6 +13,7 @@ ParticlesScriptingInterface::ParticlesScriptingInterface() :
     _nextCreatorTokenID(0),
     _particleTree(NULL)
 {
+    NodeList::getInstance()->addNodeTypeToInterestSet(NODE_TYPE_PARTICLE_SERVER);
 }
 
 
diff --git a/libraries/voxel-server/src/VoxelServer.cpp b/libraries/voxel-server/src/VoxelServer.cpp
index a1f5eaf55e..c8aee246e3 100644
--- a/libraries/voxel-server/src/VoxelServer.cpp
+++ b/libraries/voxel-server/src/VoxelServer.cpp
@@ -68,4 +68,6 @@ void VoxelServer::beforeRun() {
         qDebug("Using Minimal Environment=%s", debug::valueOf(_sendMinimalEnvironment));
     }
     qDebug("Sending environments=%s", debug::valueOf(_sendEnvironments));
+    
+    NodeList::getInstance()->addNodeTypeToInterestSet(NODE_TYPE_ANIMATION_SERVER);
 }
diff --git a/libraries/voxels/src/VoxelsScriptingInterface.cpp b/libraries/voxels/src/VoxelsScriptingInterface.cpp
index 3f4e19f60a..40c6ff8d1d 100644
--- a/libraries/voxels/src/VoxelsScriptingInterface.cpp
+++ b/libraries/voxels/src/VoxelsScriptingInterface.cpp
@@ -8,6 +8,10 @@
 
 #include "VoxelsScriptingInterface.h"
 
+VoxelsScriptingInterface::VoxelsScriptingInterface() {
+    NodeList::getInstance()->addNodeTypeToInterestSet(NODE_TYPE_VOXEL_SERVER);
+}
+
 void VoxelsScriptingInterface::queueVoxelAdd(PACKET_TYPE addPacketType, VoxelDetail& addVoxelDetails) {
     getVoxelPacketSender()->queueVoxelEditMessages(addPacketType, 1, &addVoxelDetails);
 }
diff --git a/libraries/voxels/src/VoxelsScriptingInterface.h b/libraries/voxels/src/VoxelsScriptingInterface.h
index a1f52fc1c3..500a0cbc5d 100644
--- a/libraries/voxels/src/VoxelsScriptingInterface.h
+++ b/libraries/voxels/src/VoxelsScriptingInterface.h
@@ -20,6 +20,8 @@
 class VoxelsScriptingInterface : public OctreeScriptingInterface {
     Q_OBJECT
 public:
+    VoxelsScriptingInterface();
+    
     VoxelEditPacketSender* getVoxelPacketSender() { return (VoxelEditPacketSender*)getPacketSender(); }
 
     virtual NODE_TYPE getServerNodeType() const { return NODE_TYPE_VOXEL_SERVER; }