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

Merge pull request #15937 from MiladNazeri/sessionDisplayNameChange

Browse source 
[BUGZ-537] :: removed session display name from nametag
This commit is contained in:
MiladNazeri 2019-07-16 18:06:05 -07:00 committed by GitHub
commit 25fc4fbb8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/simplifiedUI/ui/simplifiedNametag/resources/modules/nameTagListManager.js
View file

@ -253,11 +253,7 @@ function getCorrectName(uuid) {
var avatar = _this.avatars[uuid]; var avatar = _this.avatars[uuid];
var avatarInfo = avatar.avatarInfo; var avatarInfo = avatar.avatarInfo;
var displayNameToUse = avatarInfo.sessionDisplayName.trim(); var displayNameToUse = avatarInfo.displayName.trim();
if (displayNameToUse === "") {
displayNameToUse = avatarInfo.displayName.trim();
}
if (displayNameToUse === "") { if (displayNameToUse === "") {
displayNameToUse = "anonymous"; displayNameToUse = "anonymous";

6
scripts/simplifiedUI/ui/simplifiedStatusIndicator/simplifiedStatusIndicator.js
View file

@ -60,10 +60,8 @@ function simplifiedStatusIndicator(properties) {
var queryParamString = "type=heartbeat"; var queryParamString = "type=heartbeat";
queryParamString += "&username=" + AccountServices.username; queryParamString += "&username=" + AccountServices.username;
var displayNameToSend = MyAvatar.sessionDisplayName; var displayNameToSend = MyAvatar.displayName;
if (displayNameToSend === "") {
displayNameToSend = MyAvatar.displayName;
}
queryParamString += "&displayName=" + displayNameToSend; queryParamString += "&displayName=" + displayNameToSend;
queryParamString += "&status=" + currentStatus; queryParamString += "&status=" + currentStatus;
queryParamString += "&organization=" + location.hostname; queryParamString += "&organization=" + location.hostname;