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

Merge pull request #10911 from zfox23/PAL_adminFix2

Browse source 
Set admin status even if QML can't find user in PAL
This commit is contained in:
Zach Fox 2017-07-07 10:24:53 -07:00 committed by GitHub
commit e222753aac
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1101,9 +1101,9 @@ Rectangle {
case 'nearbyUsers': case 'nearbyUsers':
var data = message.params; var data = message.params;
var index = -1; var index = -1;
iAmAdmin = Users.canKick;
index = findNearbySessionIndex('', data); index = findNearbySessionIndex('', data);
if (index !== -1) { if (index !== -1) {
iAmAdmin = Users.canKick;
myData = data[index]; myData = data[index];
data.splice(index, 1); data.splice(index, 1);
} else { } else {

3
scripts/system/pal.js
View file

@ -862,6 +862,9 @@ function avatarDisconnected(nodeID) {
function clearLocalQMLDataAndClosePAL() { function clearLocalQMLDataAndClosePAL() {
sendToQml({ method: 'clearLocalQMLData' }); sendToQml({ method: 'clearLocalQMLData' });
if (onPalScreen) {
tablet.gotoHomeScreen();
}
} }
function avatarAdded(avatarID) { function avatarAdded(avatarID) {