From 206792f851fb288ff7c96ddcfff0bdb25a9ad8fa Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 21 Mar 2019 15:00:11 -0700
Subject: [PATCH] don't queue AvatarEntity messages when not in domain

---
 interface/src/avatar/MyAvatar.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index ddedc270f8..298e661f24 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -3454,6 +3454,11 @@ void MyAvatar::setSessionUUID(const QUuid& sessionUUID) {
     QUuid oldSessionID = getSessionUUID();
     Avatar::setSessionUUID(sessionUUID);
     QUuid newSessionID = getSessionUUID();
+    if (DependencyManager::get<NodeList>()->getSessionUUID().isNull()) {
+        // we don't actually have a connection to a domain right now
+        // so there is no need to queue AvatarEntity messages --> bail early
+        return;
+    }
     if (newSessionID != oldSessionID) {
         auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
         EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;