Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15954 from SimonWalton-HiFi/avatar-theft-restore

Browse source 
BUGZ-1022: Restore avatar theft functionality to Lilypad
This commit is contained in:
Shannon Romano 2019-07-22 15:15:09 -07:00 committed by GitHub
commit a0d0963ae9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/avatars/AvatarMixerClientData.cpp
View file

@ -204,10 +204,8 @@ void AvatarMixerClientData::processSetTraitsMessage(ReceivedMessage& message,
if (traitType == AvatarTraits::SkeletonModelURL) { if (traitType == AvatarTraits::SkeletonModelURL) {
// special handling for skeleton model URL, since we need to make sure it is in the whitelist // special handling for skeleton model URL, since we need to make sure it is in the whitelist
checkSkeletonURLAgainstWhitelist(slaveSharedData, sendingNode, packetTraitVersion); checkSkeletonURLAgainstWhitelist(slaveSharedData, sendingNode, packetTraitVersion);
#ifdef AVATAR_POP_CHECK
// Deferred for UX work. With no PoP check, no need to get the .fst. // Deferred for UX work. With no PoP check, no need to get the .fst.
_avatar->fetchAvatarFST(); _avatar->fetchAvatarFST();
#endif
} }
anyTraitsChanged = true; anyTraitsChanged = true;

12
scripts/system/clickToAvatarApp.js
View file

@ -1,7 +1,17 @@
(function () { (function () {
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
this.clickDownOnEntity = function (entityID, mouseEvent) { 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);
}; };
} }
); );