From 1ceda66ab86106a00dca4c35ca6a6ec34dbcc7e2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 29 Apr 2013 12:38:46 -0700
Subject: [PATCH] remove added debugging in avatar-mixer, light refactoring

---
 avatar-mixer/src/main.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/avatar-mixer/src/main.cpp b/avatar-mixer/src/main.cpp
index fb89759422..0b8ebe5653 100644
--- a/avatar-mixer/src/main.cpp
+++ b/avatar-mixer/src/main.cpp
@@ -79,21 +79,15 @@ int main(int argc, const char* argv[])
                 case PACKET_HEADER_HEAD_DATA:
                     // this is positional data from an agent
                     agentList->updateAgentWithData(agentAddress, packetData, receivedBytes);
-                    agentAddressIn = (sockaddr_in*) agentAddress;
-                    printf("Received agent data from agent at %s:%d\n", inet_ntoa(agentAddressIn->sin_addr), ntohs(agentAddressIn->sin_port));
                     
                     currentBufferPosition = broadcastPacket + 1;
                     agentIndex = 0;
                     
                     // send back a packet with other active agent data to this agent
-                    for (AgentList::iterator avatarAgent = agentList->begin();
-                         avatarAgent != agentList->end();
-                         avatarAgent++) {
-                        if (avatarAgent->getLinkedData() != NULL
-                            && !socketMatch(agentAddress, avatarAgent->getActiveSocket())) {
-                            currentBufferPosition = addAgentToBroadcastPacket(currentBufferPosition, &*avatarAgent);
-                        } else {
-                            printf("Not adding agent with ID %d to packet\n", avatarAgent->getAgentId());
+                    for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
+                        if (agent->getLinkedData() != NULL
+                            && !socketMatch(agentAddress, agent->getActiveSocket())) {
+                            currentBufferPosition = addAgentToBroadcastPacket(currentBufferPosition, &*agent);
                         }
                         
                         agentIndex++;