From 63c3452cf2c885c291ad64c79803ce9c49e5352d Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Fri, 19 Jul 2019 16:35:07 -0700
Subject: [PATCH] Restore avatar theft functionality; banner-click to
 appropriate menu

---
 .../src/avatars/AvatarMixerClientData.cpp              |  2 --
 scripts/system/clickToAvatarApp.js                     | 10 +++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp
index 8c4ceb2288..8081c77ee8 100644
--- a/assignment-client/src/avatars/AvatarMixerClientData.cpp
+++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp
@@ -204,10 +204,8 @@ void AvatarMixerClientData::processSetTraitsMessage(ReceivedMessage& message,
                 if (traitType == AvatarTraits::SkeletonModelURL) {
                     // special handling for skeleton model URL, since we need to make sure it is in the whitelist
                     checkSkeletonURLAgainstWhitelist(slaveSharedData, sendingNode, packetTraitVersion);
-#ifdef AVATAR_POP_CHECK
                     // Deferred for UX work. With no PoP check, no need to get the .fst.
                     _avatar->fetchAvatarFST();
-#endif
                 }
 
                 anyTraitsChanged = true;
diff --git a/scripts/system/clickToAvatarApp.js b/scripts/system/clickToAvatarApp.js
index 8024f595b5..79aa871963 100644
--- a/scripts/system/clickToAvatarApp.js
+++ b/scripts/system/clickToAvatarApp.js
@@ -1,7 +1,15 @@
 (function () {
     var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+    
+    
     this.clickDownOnEntity = function (entityID, mouseEvent) {
-        tablet.loadQMLSource("hifi/AvatarApp.qml");
+        var scripts = ScriptDiscoveryService.getRunning();
+       
+        var runningSimplified =
+            !scripts.every(function(item){ return item.name !== "simplifiedUI.js"; });
+
+        var avatarAppQML = runningSimplified ? "hifi/simplifiedUI/avatarApp/AvatarApp.qml" : "hifi/AvatarApp.qml";
+        tablet.loadQMLSource(avatarAppQML);
     };
 }
 );