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

Misc. tweaks

Browse source
This commit is contained in:
David Rowe 2018-08-11 10:11:56 +12:00
parent 38d8a9a2da
commit 2a177e04e1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/networking/src/MessagesClient.cpp
View file

@ -132,16 +132,17 @@ void MessagesClient::sendMessage(QString channel, QString message, bool localOnl
void MessagesClient::sendData(QString channel, QByteArray data, bool localOnly) { void MessagesClient::sendData(QString channel, QByteArray data, bool localOnly) {
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
QUuid senderID = nodeList->getSessionUUID();
if (localOnly) { if (localOnly) {
QUuid senderID = nodeList->getSessionUUID();
emit dataReceived(channel, data, senderID, true); emit dataReceived(channel, data, senderID, true);
} else { } else {
SharedNodePointer messagesMixer = nodeList->soloNodeOfType(NodeType::MessagesMixer); SharedNodePointer messagesMixer = nodeList->soloNodeOfType(NodeType::MessagesMixer);
if (messagesMixer) { if (messagesMixer) {
QUuid senderID = nodeList->getSessionUUID(); QUuid senderID = nodeList->getSessionUUID();
auto packetList = encodeMessagesDataPacket(channel, data, senderID); auto packetList = encodeMessagesDataPacket(channel, data, senderID);
nodeList->sendPacketList(std::move(packetList), *messagesMixer); nodeList->sendPacketList(std::move(packetList), *messagesMixer);
} else {
emit dataReceived(channel, data, senderID, true);
} }
} }
} }

2
scripts/system/tabletRezzer.js
View file

@ -49,7 +49,7 @@
STATE_MACHINE, STATE_MACHINE,
rezzerState = PROXY_HIDDEN, rezzerState = PROXY_HIDDEN,
proxyHand, proxyHand,
PROXY_EXPAND_DURATION = 500, PROXY_EXPAND_DURATION = 250,
PROXY_EXPAND_TIMEOUT = 25, PROXY_EXPAND_TIMEOUT = 25,
proxyExpandTimer = null, proxyExpandTimer = null,
proxyExpandStart, proxyExpandStart,