diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml index 8912a50ead..f206fcf21d 100644 --- a/interface/resources/qml/hifi/AvatarApp.qml +++ b/interface/resources/qml/hifi/AvatarApp.qml @@ -73,22 +73,10 @@ Rectangle { adjustWearables.refreshWearable(message.entityID, message.wearableIndex, message.properties); } else if(message.method === 'wearablesUpdated') { var wearablesModel = currentAvatar.wearables; - - console.debug('handling wearablesUpdated, new wearables count:', message.wearables.length, ': old wearables: '); - for(var i = 0; i < wearablesModel.count; ++i) { - console.debug('wearable: ', wearablesModel.get(i).properties.id); - } - wearablesModel.clear(); message.wearables.forEach(function(wearable) { wearablesModel.append(wearable); }); - - console.debug('handling wearablesUpdated: new wearables: '); - for(var i = 0; i < wearablesModel.count; ++i) { - console.debug('wearable: ', wearablesModel.get(i).properties.id); - } - adjustWearables.refresh(currentAvatar); } else if(message.method === 'scaleChanged') { currentAvatar.avatarScale = message.value; diff --git a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml index addd736b01..f69a82abcd 100644 --- a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml +++ b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml @@ -173,15 +173,18 @@ ListModel { if(comparer) { if(comparer(o1Value, o2Value) === false) { + console.debug('comparer: not equal'); + return false; + } else { + console.debug('comparer: equal'); + } + } else { + if(JSON.stringify(o1Value) !== JSON.stringify(o2Value)) { console.debug('not equal'); return false; } else { console.debug('equal'); } - } else { - if(JSON.stringify(o1Value) !== JSON.stringify(o2Value)) { - return false; - } } } @@ -210,7 +213,7 @@ ListModel { function findAvatarIndexByValue(avatar) { var index = -1; - console.debug('findAvatarIndexByValue: ', JSON.stringify(avatar)); + console.debug('findAvatarIndexByValue: ', 'name = ', avatar.name); // 2DO: find better way of determining selected avatar in bookmarks console.debug('allAvatars.count: ', allAvatars.count);