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

Fix skeletonmodelURLchanged signal

Browse source
This commit is contained in:
Zach Fox 2018-02-21 12:12:20 -08:00
parent b548567f5a
commit 74655bde49
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
View file

@ -564,6 +564,7 @@ Item {
: hifi.buttons.disabledTextColor[control.colorScheme]
}
RalewayBold {
id: rezIconLabel;
anchors.top: rezIcon.bottom;
anchors.topMargin: -4;
anchors.right: parent.right;
@ -575,13 +576,7 @@ Item {
size: 15;
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
text: {
if (MyAvatar.skeletonModelURL === root.itemHref) {
"CURRENT";
} else {
(root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)];
}
}
text: MyAvatar.skeletonModelURL === root.itemHref ? "CURRENT" : (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)];
}
}
}

2
interface/src/avatar/MyAvatar.cpp
View file

@ -1479,7 +1479,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
});
saveAvatarUrl();
emit skeletonChanged();
emit skeletonModelURLChanged();
}
void MyAvatar::removeAvatarEntities() {