From b0fee2699cabe93c7af7f6baaa9fce953a76aa15 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 22 Mar 2021 13:58:15 +1300
Subject: [PATCH] Allow time for avatar mixer to be updated with user's
 permissions

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

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 46f2ad3be8..43f67b46a3 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1595,7 +1595,11 @@ bool MyAvatar::hasAvatarEntities() const {
 void MyAvatar::handleCanRezAvatarEntitiesChanged(bool canRezAvatarEntities) {
     if (canRezAvatarEntities) {
         // Start displaying avatar entities.
-        addAvatarEntitiesToTree();
+        // Allow time for the avatar mixer to be updated with the user's permissions so that it doesn't discard the avatar 
+        // entities sent.
+        QTimer::singleShot(2 * DOMAIN_SERVER_CHECK_IN_MSECS, this, [this] {
+            addAvatarEntitiesToTree();
+        });
     } else {
         // Stop displaying avatar entities.
         removeAvatarEntitiesFromTree();