Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-04 07:30:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12959 from davidkelly/dk/14375

Browse source 
Don't populate user list in pal until you connect the events up
This commit is contained in:
John Conklin II 2018-04-23 14:47:31 -07:00 committed by GitHub
commit 2e6a563c87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/system/pal.js
View file

@ -715,7 +715,6 @@ function onTabletScreenChanged(type, url) {
ContextOverlay.enabled = false; ContextOverlay.enabled = false;
Users.requestsDomainListData = true; Users.requestsDomainListData = true;
populateNearbyUserList();
audioTimer = createAudioInterval(conserveResources ? AUDIO_LEVEL_CONSERVED_UPDATE_INTERVAL_MS : AUDIO_LEVEL_UPDATE_INTERVAL_MS); audioTimer = createAudioInterval(conserveResources ? AUDIO_LEVEL_CONSERVED_UPDATE_INTERVAL_MS : AUDIO_LEVEL_UPDATE_INTERVAL_MS);
@ -726,6 +725,7 @@ function onTabletScreenChanged(type, url) {
Users.usernameFromIDReply.connect(usernameFromIDReply); Users.usernameFromIDReply.connect(usernameFromIDReply);
triggerMapping.enable(); triggerMapping.enable();
triggerPressMapping.enable(); triggerPressMapping.enable();
populateNearbyUserList();
} else { } else {
off(); off();
ContextOverlay.enabled = true; ContextOverlay.enabled = true;