From 06b794563f6fc4170df5fbb654c3f1bde4658c4a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 22 Apr 2013 17:40:27 -0700 Subject: [PATCH] stop sending avatar agents to other avatars in DS packet --- domain-server/src/main.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 05e1583fca..fceedc6678 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -135,7 +135,11 @@ int main(int argc, const char * argv[]) !agent->matches((sockaddr *)&agentPublicAddress, (sockaddr *)&agentLocalAddress, agentType)) { if (memchr(SOLO_AGENT_TYPES_STRING, agent->getType(), 1) == NULL) { // this is an agent of which there can be multiple, just add them to the packet - currentBufferPos = addAgentToBroadcastPacket(currentBufferPos, &(*agent)); + // don't send avatar agents to other avatars, that will come from avatar mixer + if (agentType != AGENT_TYPE_AVATAR || agent->getType() != AGENT_TYPE_AVATAR) { + currentBufferPos = addAgentToBroadcastPacket(currentBufferPos, &(*agent)); + } + } else { // solo agent, we need to only send newest if (newestSoloAgents[agent->getType()] == NULL ||