From eca72926514d7aad764d704d862fa20f4b589128 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Sun, 30 Apr 2017 09:44:34 -0700
Subject: [PATCH] check your own location data on failure, and notify if it is
 wrong

---
 scripts/system/makeUserConnection.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/scripts/system/makeUserConnection.js b/scripts/system/makeUserConnection.js
index 92d6791617..2c984833b4 100644
--- a/scripts/system/makeUserConnection.js
+++ b/scripts/system/makeUserConnection.js
@@ -600,6 +600,22 @@
         debug("failing with result data", result);
         // IWBNI we also did some fail sound/visual effect.
         Window.makeConnection(false, result.connection);
+        if (Account.isLoggedIn()) { // Give extra failure info
+            request(location.metaverseServerUrl + '/api/v1/users/' + Account.username + '/location', function (error, response) {
+                var message = '';
+                if (error || response.status !== 'success') {
+                    message = 'Unable to get location.';
+                } else if (!response.data || !response.data.location) {
+                    message = "Unexpected location value: " + JSON.stringify(response);
+                } else if (response.data.location.node_id !== cleanId(MyAvatar.sessionUUID)) {
+                    message = 'Session identification does not match database. Maybe you are logged in on another machine? That would prevent handshakes.' + JSON.stringify(response) + MyAvatar.sessionUUID;
+                }
+                if (message) {
+                    Window.makeConnection(false, message);
+                }
+                debug("account location:", message || 'ok');
+            });
+        }
         UserActivityLogger.makeUserConnection(connectingId, false, result.connection);
     }
     var POLL_INTERVAL_MS = 200, POLL_LIMIT = 5;
@@ -612,7 +628,7 @@
             debug(response, 'pollCount', pollCount);
             if (pollCount++ >= POLL_LIMIT) { // server will expire, but let's not wait that long.
                 debug('POLL LIMIT REACHED; TIMEOUT: expired message generated by CLIENT');
-                result = {status: 'error', connection: 'no-partner-found'};
+                result = {status: 'error', connection: 'No logged-in partner found.'};
                 connectionRequestCompleted();
             } else { // poll
                 Script.setTimeout(function () {