From f86704fa94114a22c3831b4bf0af3f68868cd0a3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 25 Apr 2013 15:21:44 -0700 Subject: [PATCH] update avatar-mixer to use new AgentList iterator --- avatar-mixer/src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/avatar-mixer/src/main.cpp b/avatar-mixer/src/main.cpp index 1d446f40f4..e9fbda89df 100644 --- a/avatar-mixer/src/main.cpp +++ b/avatar-mixer/src/main.cpp @@ -83,11 +83,11 @@ int main(int argc, char* argv[]) agentIndex = 0; // send back a packet with other active agent data to this agent - for (std::vector::iterator avatarAgent = agentList->getAgents().begin(); - avatarAgent != agentList->getAgents().end(); + for (AgentList::iterator avatarAgent = agentList->begin(); + avatarAgent != agentList->end(); avatarAgent++) { - if (avatarAgent->getLinkedData() != NULL - && agentIndex != agentList->indexOfMatchingAgent(agentAddress)) { + if ((*avatarAgent).getLinkedData() != NULL + && !socketMatch(agentAddress, (*avatarAgent).getActiveSocket())) { currentBufferPosition = addAgentToBroadcastPacket(currentBufferPosition, &*avatarAgent); }