From d37789234dadd5944d664ca25a1022605bebe98c Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 12 Jul 2017 14:24:23 -0700 Subject: [PATCH] Remove from default scripts --- scripts/defaultScripts.js | 1 - .../marketplace/spectator-camera/spectatorCamera.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 4902f66a51..2270118861 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -25,7 +25,6 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/tablet-goto.js", "system/marketplaces/marketplaces.js", "system/edit.js", - "system/spectatorCamera.js", "system/notifications.js", "system/dialTone.js", "system/firstPersonHMD.js", diff --git a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js index 411a43a628..283d502820 100644 --- a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js +++ b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js @@ -157,7 +157,7 @@ if ((isHMDMode || showSpectatorInDesktop) && !isShuttingDown) { button = tablet.addButton({ text: buttonName, - icon: "icons/tablet-icons/spectator-i.svg" + icon: Script.resourcesPath() + "icons/tablet-icons/spectator-i.svg" }); button.clicked.connect(onTabletButtonClicked); } @@ -383,7 +383,7 @@ // Relevant Variables: // -SPECTATOR_CAMERA_QML_SOURCE: The path to the SpectatorCamera QML // -onSpectatorCameraScreen: true/false depending on whether we're looking at the spectator camera app. - var SPECTATOR_CAMERA_QML_SOURCE = "../SpectatorCamera.qml"; + var SPECTATOR_CAMERA_QML_SOURCE = Script.resourcesPath() + "qml/hifi/SpectatorCamera.qml"; var onSpectatorCameraScreen = false; function onTabletButtonClicked() { if (!tablet) {