From 77bb6fa4d54b0f7cccdcd6aa6b86d7fd58b963b4 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Wed, 5 Sep 2018 11:53:49 -0700 Subject: [PATCH] adding position to try again zone; updating whitespace --- interface/resources/serverless/redirect.json | 44 ++++++++++---------- libraries/networking/src/AddressManager.cpp | 4 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/interface/resources/serverless/redirect.json b/interface/resources/serverless/redirect.json index 48b1a7078f..64cb4d8a3f 100644 --- a/interface/resources/serverless/redirect.json +++ b/interface/resources/serverless/redirect.json @@ -9,39 +9,39 @@ "clientOnly": false, "collidesWith": "static,dynamic,kinematic,otherAvatar,", "collisionMask": 23, - "created": "2018-09-05T00:40:03Z", + "created": "2018-09-05T18:13:00Z", "dimensions": { - "blue": 0.8660923838615417, - "green": 1.921838402748108, - "red": 1.2744625806808472, - "x": 1.2744625806808472, - "y": 1.921838402748108, - "z": 0.8660923838615417 + "blue": 1.159199833869934, + "green": 2.8062009811401367, + "red": 1.6216505765914917, + "x": 1.6216505765914917, + "y": 2.8062009811401367, + "z": 1.159199833869934 }, - "id": "{781e26c7-ecfa-44b2-b7ef-4e3278787fbc}", - "lastEdited": 1536108183362142, - "lastEditedBy": "{4656d4a8-5e61-4230-ab34-2888d7945bd6}", + "id": "{d0ed60b8-9174-4c56-8e78-2c5399329ae0}", + "lastEdited": 1536171372916208, + "lastEditedBy": "{151cb20e-715a-4c80-aa0d-5b58b1c8a0c9}", "locked": true, "name": "Try Again Zone", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "position": { - "blue": 4.225754737854004, - "green": 1.7677892446517944, - "red": 2.778148889541626, - "x": 2.778148889541626, - "y": 1.7677892446517944, - "z": 4.225754737854004 + "blue":4.015342712402344, + "green":1.649999976158142, + "red":2.00921893119812, + "x":2.00921893119812, + "y":1.649999976158142, + "z":4.015342712402344 }, "queryAACube": { - "scale": 2.4632973670959473, - "x": 1.5465002059936523, - "y": 0.5361405611038208, - "z": 2.9941060543060303 + "scale": 3.4421300888061523, + "x": 1.6001315116882324, + "y": -0.07100248336791992, + "z": 0.14220571517944336 }, "rotation": { - "w": 0.9743700623512268, + "w": 0.9914448857307434, "x": 0, - "y": -0.22495104372501373, + "y": -0.13052619993686676, "z": 0 }, "script": "https://hifi-content.s3.amazonaws.com/wayne/404redirectionScripts/zoneTryAgainEntityScript.js", diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 1b258e14b1..6ebd516063 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -259,8 +259,8 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) { UserActivityLogger::getInstance().wentTo(trigger, URL_TYPE_USER, lookupUrl.toString()); - // save the last visited domain URL. - _lastVisitedURL = lookupUrl; + // save the last visited domain URL. + _lastVisitedURL = lookupUrl; // in case we're failing to connect to where we thought this user was // store their username as previous lookup so we can refresh their location via API