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

It's working! Untested on human avatars.

Browse source
This commit is contained in:
Zach Fox 2016-12-16 14:18:28 -08:00
parent 2c5db54b08
commit aa837d8858
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,10 +75,17 @@ Rectangle {
case 'updateUsername': case 'updateUsername':
var userId = message.params[0]; var userId = message.params[0];
var userName = message.params[1]; var userName = message.params[1];
console.log('passed userId:', userId);
console.log('passed userName:', userName);
if (!userId) {
myData.userName = userName;
myCard.userName = userName;
} else {
var userIndex = findSessionIndex(userId); var userIndex = findSessionIndex(userId);
console.log('computed userIndex:', userIndex); console.log('computed userIndex:', userIndex);
userModel.get(userIndex).userName = userName; userModel.get(userIndex).userName = userName;
userData[userIndex].userName = userName; userData[userIndex].userName = userName;
}
break; break;
default: default:
console.log('Unrecognized message:', JSON.stringify(message)); console.log('Unrecognized message:', JSON.stringify(message));

7
scripts/system/pal.js
View file

@ -134,7 +134,12 @@ function populateUserList() {
} }
function usernameFromID(id, username) { function usernameFromID(id, username) {
var data = [id, username + '/' + id ]; var data;
if (AvatarList.getAvatar('').sessionUUID === id) {
data = ['', username + ' (hidden)']
} else {
data = [id, username + '/' + id];
}
print('Username Data:', JSON.stringify(data)); print('Username Data:', JSON.stringify(data));
pal.sendToQml({ method: 'updateUsername', params: data }); pal.sendToQml({ method: 'updateUsername', params: data });
} }