Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 18:58:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't tell ESS about script Agents that won't talk to it

Browse source
This commit is contained in:
Stephen Birarda 2017-01-24 17:08:13 -08:00
parent 69b47dcf50
commit fc42c1bc94
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
domain-server/src/DomainServer.cpp
View file

@ -960,11 +960,14 @@ void DomainServer::sendDomainListToNode(const SharedNodePointer& node, const Hif
// (1/19/17) Agents only need to connect to Entity Script Servers to perform administrative tasks // (1/19/17) Agents only need to connect to Entity Script Servers to perform administrative tasks
// related to entity server scripts. Only agents with rez permissions should be doing that, so // related to entity server scripts. Only agents with rez permissions should be doing that, so
// if the agent does not have those permissions, we do not want them and the server to incur the // if the agent does not have those permissions, we do not want them and the server to incur the
// overhead of connecting to one another. // overhead of connecting to one another. Additionally we exclude agents that do not care about the
// Entity Script Server and won't attempt to connect to it.
auto otherNodeData = static_cast<DomainServerNodeData*>(otherNode->getLinkedData());
bool shouldNotConnect = (node->getType() == NodeType::Agent && otherNode->getType() == NodeType::EntityScriptServer bool shouldNotConnect = (node->getType() == NodeType::Agent && otherNode->getType() == NodeType::EntityScriptServer
&& !node->getCanRez() && !node->getCanRezTmp()) && !node->getCanRez() && !node->getCanRezTmp())
|| (node->getType() == NodeType::EntityScriptServer && otherNode->getType() == NodeType::Agent || (node->getType() == NodeType::EntityScriptServer && otherNode->getType() == NodeType::Agent
&& !otherNode->getCanRez() && !otherNode->getCanRezTmp()); && (!otherNodeData->getNodeInterestSet().contains(NodeType::EntityServer) ||
!otherNode->getCanRez() && !otherNode->getCanRezTmp()));
if (!shouldNotConnect) { if (!shouldNotConnect) {
// since we're about to add a node to the packet we start a segment // since we're about to add a node to the packet we start a segment