Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats

This commit is contained in:
ZappoMan 2013-07-18 14:14:03 -07:00
commit 7cc887a2f7

View file

@ -472,8 +472,7 @@ void *removeSilentNodes(void *args) {
for(NodeList::iterator node = nodeList->begin(); node != nodeList->end(); ++node) {
if ((checkTimeUSecs - node->getLastHeardMicrostamp()) > NODE_SILENCE_THRESHOLD_USECS
&& node->getType() != NODE_TYPE_VOXEL_SERVER) {
if ((checkTimeUSecs - node->getLastHeardMicrostamp()) > NODE_SILENCE_THRESHOLD_USECS) {
qDebug() << "Killed" << *node << "\n";