From 65dcd583718c055ef08ad622fa053295c62978bf Mon Sep 17 00:00:00 2001
From: Penguin-Guru <Penguin-Guru@ProtonMail.com>
Date: Wed, 24 Nov 2021 08:51:43 -0800
Subject: [PATCH 1/4] This seems fine?

---
 interface/resources/qml/hifi/audio/PlaySampleSound.qml        | 4 +---
 .../qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml         | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/hifi/audio/PlaySampleSound.qml b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
index f1351b8cbf..847f876140 100644
--- a/interface/resources/qml/hifi/audio/PlaySampleSound.qml
+++ b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
@@ -25,10 +25,8 @@ RowLayout {
         sample = null;
     }
     function playSound() {
-        // FIXME: MyAvatar is not properly exposed to QML; MyAvatar.qmlPosition is a stopgap
-        // FIXME: AudioScriptingInterface.playSystemSound should not require position
         if (sample === null && !isPlaying) {
-            sample = AudioScriptingInterface.playSystemSound(sound, MyAvatar.qmlPosition);
+            sample = AudioScriptingInterface.playSystemSound(sound);
             isPlaying = true;
             sample.finished.connect(reset);
         }
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
index 345c124725..ea2b1467b5 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
@@ -384,10 +384,8 @@ Flickable {
                     sample = null;
                 }
                 function playSound() {
-                    // FIXME: MyAvatar is not properly exposed to QML; MyAvatar.qmlPosition is a stopgap
-                    // FIXME: AudioScriptingInterface.playSystemSound should not require position
                     if (sample === null && !isPlaying) {
-                        sample = AudioScriptingInterface.playSystemSound(sound, MyAvatar.qmlPosition);
+                        sample = AudioScriptingInterface.playSystemSound(sound);
                         isPlaying = true;
                         sample.finished.connect(reset);
                     }

From cf50bcb71b86b35a10cfdba4e6e0ceb1a1b6632b Mon Sep 17 00:00:00 2001
From: Penguin-Guru <Penguin-Guru@ProtonMail.com>
Date: Wed, 24 Nov 2021 17:55:55 -0800
Subject: [PATCH 2/4] Marked qmlPosition as deprecated.

---
 interface/src/avatar/MyAvatar.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 3fceae534f..88c2ea3f9c 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -170,7 +170,7 @@ class MyAvatar : public Avatar {
      * @property {Vec3} skeletonOffset - Can be used to apply a translation offset between the avatar's position and the
      *     registration point of the 3D model.
      *
-     * @property {Vec3} qmlPosition - A synonym for <code>position</code> for use by QML.
+     * @property {Vec3} qmlPosition - A synonym for <code>position</code> for use by QML. This is deprecated.
      *
      * @property {Vec3} feetPosition - The position of the avatar's feet.
      * @property {boolean} shouldRenderLocally=true - If <code>true</code> then your avatar is rendered for you in Interface,

From 78981307e6208fcf6753b044c2b9dca133499c47 Mon Sep 17 00:00:00 2001
From: Penguin-Guru <Penguin-Guru@ProtonMail.com>
Date: Wed, 24 Nov 2021 18:13:06 -0800
Subject: [PATCH 3/4] This seems like the last one. Untested.

---
 .../resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
index cc64f8bd9f..d713f3f6f9 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
@@ -386,10 +386,8 @@ Flickable {
                     sample = null;
                 }
                 function playSound() {
-                    // FIXME: MyAvatar is not properly exposed to QML; MyAvatar.qmlPosition is a stopgap
-                    // FIXME: AudioScriptingInterface.playSystemSound should not require position
                     if (sample === null && !isPlaying) {
-                        sample = AudioScriptingInterface.playSystemSound(sound, MyAvatar.qmlPosition);
+                        sample = AudioScriptingInterface.playSystemSound(sound);
                         isPlaying = true;
                         sample.finished.connect(reset);
                     }

From 9de2ac1eb52e599734fd71f2c44612d2b91af26e Mon Sep 17 00:00:00 2001
From: Penguin-Guru <Penguin-Guru@ProtonMail.com>
Date: Thu, 25 Nov 2021 15:24:13 -0800
Subject: [PATCH 4/4] Made requested change.

---
 interface/src/avatar/MyAvatar.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 88c2ea3f9c..8b5ffa233a 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -170,7 +170,8 @@ class MyAvatar : public Avatar {
      * @property {Vec3} skeletonOffset - Can be used to apply a translation offset between the avatar's position and the
      *     registration point of the 3D model.
      *
-     * @property {Vec3} qmlPosition - A synonym for <code>position</code> for use by QML. This is deprecated.
+     * @property {Vec3} qmlPosition - A synonym for <code>position</code> for use by QML.
+     *     <p class="important">Deprecated: This property is deprecated and will be removed.</p>
      *
      * @property {Vec3} feetPosition - The position of the avatar's feet.
      * @property {boolean} shouldRenderLocally=true - If <code>true</code> then your avatar is rendered for you in Interface,