From bb479671261f844cdd93b67ce876346a833334ce Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 22 Mar 2013 10:46:37 -0700
Subject: [PATCH] send head data to VS for level differentiation, remove the VS
 add callback

---
 shared/src/AgentList.cpp | 8 +++-----
 shared/src/AgentList.h   | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/shared/src/AgentList.cpp b/shared/src/AgentList.cpp
index d82e08943a..125e90feed 100644
--- a/shared/src/AgentList.cpp
+++ b/shared/src/AgentList.cpp
@@ -24,13 +24,11 @@ pthread_mutex_t vectorChangeMutex = PTHREAD_MUTEX_INITIALIZER;
 AgentList::AgentList() : agentSocket(AGENT_SOCKET_LISTEN_PORT) {
     linkedDataCreateCallback = NULL;
     audioMixerSocketUpdate = NULL;
-    voxelServerAddCallback = NULL;
 }
 
 AgentList::AgentList(int socketListenPort) : agentSocket(socketListenPort) {
     linkedDataCreateCallback = NULL;
     audioMixerSocketUpdate = NULL;
-    voxelServerAddCallback = NULL;
 }
 
 AgentList::~AgentList() {
@@ -158,8 +156,8 @@ bool AgentList::addOrUpdateAgent(sockaddr *publicSocket, sockaddr *localSocket,
             // to use the local socket information the domain server gave us
             sockaddr_in *localSocketIn = (sockaddr_in *)localSocket;
             audioMixerSocketUpdate(localSocketIn->sin_addr.s_addr, localSocketIn->sin_port);
-        } else if (newAgent.getType() == 'V' && voxelServerAddCallback != NULL) {
-            voxelServerAddCallback(localSocket);
+        } else if (newAgent.getType() == 'V') {
+            newAgent.activateLocalSocket();
         }
         
         std::cout << "Added agent - " << &newAgent << "\n";
@@ -186,7 +184,7 @@ void AgentList::broadcastToAgents(char *broadcastData, size_t dataBytes) {
     for(std::vector<Agent>::iterator agent = agents.begin(); agent != agents.end(); agent++) {
         // for now assume we only want to send to other interface clients
         // until the Audio class uses the AgentList
-        if (agent->getActiveSocket() != NULL && agent->getType() == 'I') {
+        if (agent->getActiveSocket() != NULL && (agent->getType() == 'I' || agent->getType() == 'V')) {
             // we know which socket is good for this agent, send there
             agentSocket.send(agent->getActiveSocket(), broadcastData, dataBytes);
         }
diff --git a/shared/src/AgentList.h b/shared/src/AgentList.h
index 4f7a8dc813..18dc8945da 100644
--- a/shared/src/AgentList.h
+++ b/shared/src/AgentList.h
@@ -31,7 +31,6 @@ class AgentList {
         
         void(*linkedDataCreateCallback)(Agent *);
         void(*audioMixerSocketUpdate)(in_addr_t, in_port_t);
-        void(*voxelServerAddCallback)(sockaddr *);
 
         std::vector<Agent>& getAgents();
         UDPSocket& getAgentSocket();