Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 21:15:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement BUGZ-305 and BUGZ-306

Browse source
This commit is contained in:
Zach Fox 2019-05-22 09:56:28 -07:00
parent 930018a924
commit 6f7557b00d
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
View file

@ -230,6 +230,10 @@ Rectangle {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
outputDeviceButton.outputMuted = !outputDeviceButton.outputMuted; outputDeviceButton.outputMuted = !outputDeviceButton.outputMuted;
if (outputDeviceButton.outputMuted && !AudioScriptingInterface.muted) {
AudioScriptingInterface.muted = true;
}
sendToScript({ sendToScript({
"source": "SimplifiedTopBar.qml", "source": "SimplifiedTopBar.qml",
"method": "setOutputMuted", "method": "setOutputMuted",

19
scripts/system/simplifiedUI/simplifiedStatusIndicator/simplifiedStatusIndicator.js
View file

@ -57,22 +57,21 @@ function simplifiedStatusIndicator(properties) {
that.statusChanged(); that.statusChanged();
} }
var queryParamString = "type=heartbeat";
queryParamString += "&username=" + AccountServices.username;
var displayNameToSend = MyAvatar.sessionDisplayName; var displayNameToSend = MyAvatar.sessionDisplayName;
queryParamString += currentStatus;
if (displayNameToSend === "") { if (displayNameToSend === "") {
displayNameToSend = MyAvatar.displayName; displayNameToSend = MyAvatar.displayName;
} }
var queryParamString = "type=heartbeat";
queryParamString += "&username=" + AccountServices.username;
queryParamString += "&displayName=" + displayNameToSend; queryParamString += "&displayName=" + displayNameToSend;
queryParamString += "&status="; queryParamString += "&status=" + currentStatus;
queryParamString += currentStatus; queryParamString += "&organization=" + location.hostname;
var uri = REQUEST_URL + "?" + queryParamString; var uri = REQUEST_URL + "?" + queryParamString;
if (DEBUG) { if (DEBUG) {
console.log("setStatus: " + uri); console.log("simplifiedStatusIndicator: setStatus: " + uri);
} }
request({ request({
@ -95,7 +94,7 @@ function simplifiedStatusIndicator(properties) {
var uri = REQUEST_URL + "?" + queryParamString; var uri = REQUEST_URL + "?" + queryParamString;
if (DEBUG) { if (DEBUG) {
console.log("getStatus: " + uri); console.log("simplifiedStatusIndicator: getStatus: " + uri);
} }
request({ request({
@ -173,7 +172,7 @@ function simplifiedStatusIndicator(properties) {
var uri = REQUEST_URL + "?" + queryParamString; var uri = REQUEST_URL + "?" + queryParamString;
if (DEBUG) { if (DEBUG) {
console.log("simplifiedStatusIndicator onDomainChanged: " + uri); console.log("simplifiedStatusIndicator: onDomainChanged: " + uri);
} }
request({ request({
@ -184,7 +183,7 @@ function simplifiedStatusIndicator(properties) {
} else { } else {
// successfully sent updateLocation // successfully sent updateLocation
if (DEBUG) { if (DEBUG) {
console.log("Successfully updated location after domain change."); console.log("simplifiedStatusIndicator: Successfully updated location after domain change.");
} }
} }
}); });

4
scripts/system/simplifiedUI/simplifiedUI.js
View file

@ -469,8 +469,8 @@ function onStatusChanged() {
} }
var simplifiedNametag = Script.require("./simplifiedNametag/simplifiedNametag.js"); var simplifiedNametag = Script.require("./simplifiedNametag/simplifiedNametag.js?" + Date.now());
var SimplifiedStatusIndicator = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js"); var SimplifiedStatusIndicator = Script.require("./simplifiedStatusIndicator/simplifiedStatusIndicator.js?" + Date.now());
var si; var si;
var oldShowAudioTools; var oldShowAudioTools;
var oldShowBubbleTools; var oldShowBubbleTools;