Merge branch 'master' of https://github.com/highfidelity/hifi into reverb

This commit is contained in:
Atlante45 2014-10-17 14:03:11 -07:00
commit 89cb464eaa

View file

@ -622,7 +622,7 @@ bool DomainServer::shouldAllowConnectionFromNode(const QString& username,
// we always let in a user who is sending a packet from our local socket or from the localhost address
if (senderSockAddr.getAddress() == LimitedNodeList::getInstance()->getLocalSockAddr().getAddress()
&& senderSockAddr.getAddress() == QHostAddress::LocalHost) {
|| senderSockAddr.getAddress() == QHostAddress::LocalHost) {
return true;
}