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

typo, and delete request on abort/fail

Browse source
This commit is contained in:
Howard Stearns 2017-03-30 12:40:54 -07:00
parent af25e0e21f
commit 3056bb16a2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/DiscoverabilityManager.cpp
View file

@ -72,8 +72,8 @@ void DiscoverabilityManager::updateLocation() {
// in case the place/domain isn't in the database, we send the network address and port // in case the place/domain isn't in the database, we send the network address and port
auto& domainSockAddr = domainHandler.getSockAddr(); auto& domainSockAddr = domainHandler.getSockAddr();
const QString NETWORK_ADRESS_KEY_IN_LOCATION = "network_address"; const QString NETWORK_ADDRESS_KEY_IN_LOCATION = "network_address";
locationObject.insert(NETWORK_ADRESS_KEY_IN_LOCATION, domainSockAddr.getAddress().toString()); locationObject.insert(NETWORK_ADDRESS_KEY_IN_LOCATION, domainSockAddr.getAddress().toString());
const QString NETWORK_ADDRESS_PORT_IN_LOCATION = "network_port"; const QString NETWORK_ADDRESS_PORT_IN_LOCATION = "network_port";
locationObject.insert(NETWORK_ADDRESS_PORT_IN_LOCATION, domainSockAddr.getPort()); locationObject.insert(NETWORK_ADDRESS_PORT_IN_LOCATION, domainSockAddr.getPort());

2
scripts/system/makeUserConnection.js
View file

@ -458,6 +458,8 @@ function endHandshake() {
debug("removing animation"); debug("removing animation");
MyAvatar.removeAnimationStateHandler(animHandlerId); MyAvatar.removeAnimationStateHandler(animHandlerId);
} }
// No-op if we were successful, but this way we ensure that failures and abandoned handshakes don't leave us in a weird state.
request({uri: requestUrl, method: 'DELETE'}, debug);
} }
function updateTriggers(value, fromKeyboard, hand) { function updateTriggers(value, fromKeyboard, hand) {