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

Merge latest upstream into local repo.

Browse source
This commit is contained in:
Andrew Meadows 2014-01-15 17:04:33 -08:00
commit 4e51aee00b
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -416,7 +416,7 @@ int DomainServer::civetwebRequestHandler(struct mg_connection *connection) {
mg_printf(connection, "%s", RESPONSE_200); mg_printf(connection, "%s", RESPONSE_200);
// we have a valid UUID and node - kill the node that has this assignment // we have a valid UUID and node - kill the node that has this assignment
NodeList::getInstance()->killNodeWithUUID(deleteUUID); QMetaObject::invokeMethod(NodeList::getInstance(), "killNodeWithUUID", Q_ARG(const QUuid&, deleteUUID));
// successfully processed request // successfully processed request
return 1; return 1;

3
interface/src/starfield/Controller.cpp
View file

@ -19,7 +19,8 @@ bool Controller::computeStars(unsigned numStars, unsigned seed) {
this->retile(numStars, _tileResolution); this->retile(numStars, _tileResolution);
qDebug() << "Total time to generate stars: " << ((usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << "msec"; qDebug() << "Total time to retile and generate stars: "
<< ((usecTimestampNow() - usecTimestamp(&startTime)) / 1000) << "msec";
return true; return true;
} }

3
libraries/shared/src/NodeList.h
View file

@ -95,7 +95,6 @@ public:
int fillPingReplyPacket(unsigned char* pingBuffer, unsigned char* replyBuffer); int fillPingReplyPacket(unsigned char* pingBuffer, unsigned char* replyBuffer);
void pingPublicAndLocalSocketsForInactiveNode(Node* node); void pingPublicAndLocalSocketsForInactiveNode(Node* node);
void killNodeWithUUID(const QUuid& nodeUUID);
void sendKillNode(const char* nodeTypes, int numNodeTypes); void sendKillNode(const char* nodeTypes, int numNodeTypes);
SharedNodePointer nodeWithAddress(const HifiSockAddr& senderSockAddr); SharedNodePointer nodeWithAddress(const HifiSockAddr& senderSockAddr);
@ -120,6 +119,8 @@ public slots:
void sendDomainServerCheckIn(); void sendDomainServerCheckIn();
void pingInactiveNodes(); void pingInactiveNodes();
void removeSilentNodes(); void removeSilentNodes();
void killNodeWithUUID(const QUuid& nodeUUID);
signals: signals:
void domainChanged(const QString& domainHostname); void domainChanged(const QString& domainHostname);
void nodeAdded(SharedNodePointer); void nodeAdded(SharedNodePointer);