From a2ac43289c1c5abf9bdcebd1aa9cc5cc39fbd24a Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 9 Nov 2021 12:12:55 +1300
Subject: [PATCH] Use avatar position as orb position when head position not
 available

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

diff --git a/interface/src/avatar/OtherAvatar.cpp b/interface/src/avatar/OtherAvatar.cpp
index b6a2ea3ed9..fe0e83dfa0 100755
--- a/interface/src/avatar/OtherAvatar.cpp
+++ b/interface/src/avatar/OtherAvatar.cpp
@@ -64,7 +64,11 @@ void OtherAvatar::removeOrb() {
 void OtherAvatar::updateOrbPosition() {
     if (!_otherAvatarOrbMeshPlaceholderID.isNull()) {
         EntityItemProperties properties;
-        properties.setPosition(getHead()->getPosition());
+        glm::vec3 headPosition;
+        if (!_skeletonModel->getHeadPosition(headPosition)) {
+            headPosition = getWorldPosition();
+        }
+        properties.setPosition(headPosition);
         DependencyManager::get<EntityScriptingInterface>()->editEntity(_otherAvatarOrbMeshPlaceholderID, properties);
     }
 }