Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 02:24:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Fix merge errors

Browse source
This commit is contained in:
Zach Fox 2016-12-28 15:47:28 -08:00
parent e26d347682
commit d3700fc922
1 changed files with 3 additions and 2 deletions

5
interface/resources/qml/hifi/Pal.qml
View file

@ -212,14 +212,14 @@ Item {
datum[styleData.role] = model[styleData.role] = newValue
if (styleData.role === "personalMute") {
Users[styleData.role](model.sessionId, newValue)
} else if (styleData.role === 'ignore') {
} else if (styleData.role === "ignore") {
var key = styleData.role;
if (!newValue) {
key = 'un' + key;
}
if (newValue) {
ignored[datum.sessionId] = datum;
console.log('fixme hrs adding to ignored', JSON.stringify(datum), 'at', datum.sessionId);
console.log("fixme hrs adding to ignored", JSON.stringify(datum), "at", datum.sessionId);
} else {
delete ignored[datum.sessionId];
}
@ -232,6 +232,7 @@ Item {
sortModel()
}
}
}
}
}
// Refresh button