From 47aa1e4f8e667939dcfb7d2222c3d0c4147fc6fc Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Thu, 5 Jan 2017 12:23:17 -0800 Subject: [PATCH] add pal to defaultScripts --- interface/resources/qml/hifi/Desktop.qml | 2 +- scripts/defaultScripts.js | 2 +- scripts/system/pal.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index a33fbabdf2..e20ecd70e1 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -76,7 +76,7 @@ OriginalDesktop.Desktop { WebEngine.settings.localContentCanAccessRemoteUrls = true; [ // Allocate the standard buttons in the correct order. They will get images, etc., via scripts. - "hmdToggle", "mute", "mod", "bubble", "help", + "hmdToggle", "mute", "pal", "bubble", "help", "hudToggle", "com.highfidelity.interface.system.editButton", "marketplace", "snapshot", "goto" ].forEach(function (name) { diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 90a77b508d..0e4ed3b0ae 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -20,7 +20,7 @@ var DEFAULT_SCRIPTS = [ "system/hmd.js", "system/marketplaces/marketplace.js", "system/edit.js", - "system/mod.js", + "system/pal.js", //"system/mod.js", // older UX, if you prefer "system/selectAudioDevice.js", "system/notifications.js", "system/controllers/controllerDisplayManager.js", diff --git a/scripts/system/pal.js b/scripts/system/pal.js index e727f9a1e3..5e30209f01 100644 --- a/scripts/system/pal.js +++ b/scripts/system/pal.js @@ -11,7 +11,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -// FIXME when we make this a defaultScript: (function() { // BEGIN LOCAL_SCOPE +(function() { // BEGIN LOCAL_SCOPE Script.include("/~/system/libraries/controllers.js"); @@ -91,7 +91,7 @@ function HighlightedEntity(id, entityProperties) { }, lineWidth: 1.0, ignoreRayIntersection: true, - drawInFront: true + drawInFront: false // Arguable. For now, let's not distract with mysterious wires around the scene. }); HighlightedEntity.overlays.push(this); } @@ -416,4 +416,4 @@ Script.scriptEnding.connect(function () { }); -// FIXME: }()); // END LOCAL_SCOPE +}()); // END LOCAL_SCOPE