Update all scripts, script-archive scripts still broken.

interface/resources/qml/hifi/avatarapp/Settings.qml

@@ -456,7 +456,7 @@ Rectangle {
                 id: avatarCollisionSoundUrlInputText
                 font.pixelSize: 17
                 Layout.fillWidth: true
-                placeholderText: ExternalResource.getUrl(ExternalResource.HF_Public, '/sounds/Collisions-')
+                placeholderText: "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/sounds/Collisions-"
 
                 onFocusChanged: {
                     keyboardRaised = (avatarAnimationUrlInputText.focus || avatarCollisionSoundUrlInputText.focus);

interface/resources/qml/hifi/models/S3Model.qml

@@ -25,7 +25,7 @@ XmlListModel {
     readonly property string realPrefix: prefix.match('.*/$') ? prefix : (prefix + "/")
     readonly property string nameRegex: realPrefix + (filter ? (".*" + filter) :  "") + ".*\." + extension
     readonly property string nameQuery: "Key/substring-before(substring-after(string(), '" + prefix + "'), '." + extension + "')"
-    readonly property string baseUrl: ExternalResource.HF_Public
+    readonly property string baseUrl: "https://cdn-1.vircadia.com/eu-c-1/vircadia-public"
 
     // FIXME need to urlencode prefix?
     source: baseUrl + "?prefix=" + realPrefix

script-archive/acScripts/ControlACs.js

@@ -33,7 +33,7 @@ var LOAD = 6;
 
 
 var windowDimensions = Controller.getViewportDimensions();
-var TOOL_ICON_URL = ExternalResource.getUrl(ExternalResource.Assets, "images/tools/");
+var TOOL_ICON_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "images/tools/");
 var ALPHA_ON = 1.0;
 var ALPHA_OFF = 0.7;
 var COLOR_TOOL_BAR = { red: 0, green: 0, blue: 0 };

script-archive/acScripts/botProceduralWayPoints.js

@@ -20,7 +20,7 @@
 //
 
 //For procedural walk animation
-Script.include(ExternalResource.getUrl(ExternalResource.Assets, "scripts/acScripts/proceduralAnimationAPI.js");
+Script.include(Script.getExternalPath(Script.ExternalPaths.Assets, "scripts/acScripts/proceduralAnimationAPI.js");
 
 var procAnimAPI = new ProcAnimAPI();
 
@@ -120,9 +120,9 @@ var newBodyFilePrefix = "bot" + botNumber;
 
 // set the face model fst using the bot number
 // there is no need to change the body model - we're using the default
-Avatar.faceModelURL = ExternalResource.getUrl(ExternalResource.Assets, "meshes/" + newFaceFilePrefix + ".fst");
+Avatar.faceModelURL = Script.getExternalPath(Script.ExternalPaths.Assets, "meshes/" + newFaceFilePrefix + ".fst");
-Avatar.skeletonModelURL = ExternalResource.getUrl(ExternalResource.Assets, "meshes/" + newBodyFilePrefix + "_a.fst");
+Avatar.skeletonModelURL = Script.getExternalPath(Script.ExternalPaths.Assets, "meshes/" + newBodyFilePrefix + "_a.fst");
-Avatar.billboardURL = ExternalResource.getUrl(ExternalResource.Assets, "meshes/billboards/bot" + botNumber + ".png");
+Avatar.billboardURL = Script.getExternalPath(Script.ExternalPaths.Assets, "meshes/billboards/bot" + botNumber + ".png");
 
 Agent.isAvatar = true;
 Agent.isListeningToAudioStream = true;
@@ -145,9 +145,9 @@ function loadSounds() {
     var footstep_filenames = ["FootstepW2Left-12db.wav", "FootstepW2Right-12db.wav", "FootstepW3Left-12db.wav", "FootstepW3Right-12db.wav", 
                         "FootstepW5Left-12db.wav", "FootstepW5Right-12db.wav"];
 
-    var SOUND_BASE_URL = ExternalResource.getUrl(ExternalResource.Assets, "sounds/Cocktail+Party+Snippets/Raws/");
+    var SOUND_BASE_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Cocktail+Party+Snippets/Raws/");
 
-    var FOOTSTEP_BASE_URL = ExternalResource.getUrl(ExternalResource.Assets, "sounds/Footsteps/");
+    var FOOTSTEP_BASE_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Footsteps/");
 
     for (var i = 0; i < sound_filenames.length; i++) {
         sounds.push(SoundCache.getSound(SOUND_BASE_URL + sound_filenames[i]));

script-archive/acScripts/bot_randomExpression.js

@@ -42,9 +42,9 @@ newBodyFilePrefix = "bot" + botNumber;
 
 // set the face model fst using the bot number
 // there is no need to change the body model - we're using the default
-Avatar.faceModelURL = ExternalResource.getUrl(ExternalResource.Assets, "meshes/" + newFaceFilePrefix + ".fst");
+Avatar.faceModelURL = Script.getExternalPath(Script.ExternalPaths.Assets, "meshes/" + newFaceFilePrefix + ".fst");
-Avatar.skeletonModelURL = ExternalResource.getUrl(ExternalResource.Assets, "meshes/" + newBodyFilePrefix + ".fst");
+Avatar.skeletonModelURL = Script.getExternalPath(Script.ExternalPaths.Assets, "meshes/" + newBodyFilePrefix + ".fst");
-Avatar.billboardURL = ExternalResource.getUrl(ExternalResource.Assets, "meshes/billboards/bot" + botNumber + ".png");
+Avatar.billboardURL = Script.getExternalPath(Script.ExternalPaths.Assets, "meshes/billboards/bot" + botNumber + ".png");
 
 Agent.isAvatar = true;
 Agent.isListeningToAudioStream = true;

script-archive/acScripts/playbackMaster.js

@@ -16,7 +16,7 @@ var input_text = null;
 
 // Script. DO NOT MODIFY BEYOND THIS LINE.
 //Script.include("../libraries/toolBars.js");
-Script.include(ExternalResource.getUrl(ExternalResource.Assets, "scripts/libraries/toolBars.js"));
+Script.include(Script.getExternalPath(Script.ExternalPaths.Assets, "scripts/libraries/toolBars.js"));
 // We want small icons
 Tool.IMAGE_HEIGHT /= 2;
 Tool.IMAGE_WIDTH /= 2;
@@ -27,7 +27,7 @@ var STOP = 3;
 var LOAD = 6;
 
 var windowDimensions = Controller.getViewportDimensions();
-var TOOL_ICON_URL = ExternalResource.getUrl(ExternalResource.Assets, "images/tools/");
+var TOOL_ICON_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "images/tools/");
 var ALPHA_ON = 1.0;
 var ALPHA_OFF = 0.7;
 var COLOR_TOOL_BAR = { red: 0, green: 0, blue: 0 };

script-archive/acScripts/simpleBot.js

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 function getRandomFloat(min, max) {

script-archive/airship/airship.js

@@ -28,9 +28,8 @@
         lightTimer = 0,
         lightTimeoutID = undefined,
         audioInjector = null;
-
+ 
-    var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+    var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
-var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
     var cannonSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/cannonShot.wav");
     var explosionSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "philip/explosion.wav");
 

script-archive/avatarSelector.js

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var panelWall = false;

script-archive/blockWorld.js

@@ -19,7 +19,7 @@ var floorTiles = [];
 var blocks = [];
 var blockSpawner;
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 

script-archive/controllers/hydra/airGuitar.js

@@ -10,7 +10,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 function length(v) {

script-archive/controllers/hydra/drumStick.js

@@ -10,7 +10,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 function length(v) {

script-archive/controllers/hydra/frisbee.js

@@ -15,7 +15,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 Script.include("../../libraries/toolBars.js");
 

script-archive/controllers/hydra/gun.js

@@ -22,7 +22,7 @@ Script.include("../../libraries/utils.js");
 Script.include("../../libraries/constants.js");
 Script.include("../../libraries/toolBars.js");
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var LASER_WIDTH = 2;

script-archive/controllers/hydra/paddleBall.js

@@ -10,7 +10,7 @@
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 hitSound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav");

script-archive/controllers/hydra/toyball.js

@@ -15,7 +15,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 // maybe we should make these constants...

script-archive/controllers/toybox.js

@@ -11,7 +11,7 @@
 //
 Script.include("http://s3.amazonaws.com/hifi-public/scripts/libraries/toolBars.js");
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 

script-archive/entityScripts/recordingMaster.js

@@ -10,7 +10,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/toolBars.js");
 Script.include(VIRCADIA_PUBLIC_CDN + "scripts/libraries/utils.js");

script-archive/example/audio/audioBall.js

@@ -13,7 +13,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var sound = SoundCache.getSound(VIRCADIA_PUBLIC_CDN + "sounds/Animals/mexicanWhipoorwill.raw");

script-archive/example/audio/jsstreamplayer.js

@@ -14,7 +14,7 @@
 
 
 // Declare HiFi public bucket.
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 // Declare variables and set up new WebWindow.

script-archive/example/audio/radio.js

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var modelURL = VIRCADIA_PUBLIC_CDN + "models/entities/radio/Speakers.fbx";

script-archive/example/brownianFun.js

@@ -1,4 +1,4 @@
-var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+var 
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 var SOUND_PATH = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-hitsandslaps/";
 var soundURLS = ["67LCollision01.wav", "67LCollision02.wav", "airhockey_hit1.wav"];

script-archive/example/dynamicLandscape.js

@@ -10,7 +10,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 Script.include(VIRCADIA_PUBLIC_CDN + 'scripts/utilities.js')
 

script-archive/example/entities/editModelExample.js

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var count = 0;

script-archive/example/entities/entityModelExample.js

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var count = 0;

script-archive/example/entities/zoneEntityExample.js

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var count = 0;

script-archive/example/entities/zoneSkyboxExample.js

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var count = 0;

script-archive/example/games/airHockey.js

@@ -60,7 +60,7 @@ var puckCollisionModel = "http://headache.hungry.com/~seth/hifi/airHockeyPuck-hu
 var paddleModel = "https://hifi-public.s3.amazonaws.com/ozan/props/airHockeyTable/airHockeyPaddle.obj"
 var paddleCollisionModel = "http://headache.hungry.com/~seth/hifi/paddle-hull.obj"
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 var screenSize = Controller.getViewportDimensions();
 var BUTTON_SIZE = 32;

script-archive/example/games/billiards.js

@@ -10,7 +10,7 @@
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var tableParts = []; 
@@ -37,7 +37,7 @@ var startStroke = 0;
 var hitSound = VIRCADIA_PUBLIC_CDN + "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav";
 SoundCache.getSound(hitSound);
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 var screenSize = Controller.getViewportDimensions();
 var reticle = Overlays.addOverlay("image", {

script-archive/example/games/make-dummy.js

@@ -15,7 +15,6 @@
 /*jslint vars: true*/
 var Overlays, Entities, Controller, Script, MyAvatar, Vec3; // Referenced globals provided by High Fidelity.
 
-var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var rezButton = Overlays.addOverlay("image", {

script-archive/example/games/spaceInvadersExample.js

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 
 var iteration = 0;

script-archive/example/soundToys.js

@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
 var Camera, Vec3, Quat, Entities, Script; // Globals defined by HiFi, var'ed here to keep jslint happy.
-var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+var 
 var VIRCADIA_PUBLIC_CDN = networkingConstants.PUBLIC_BUCKET_CDN_URL;
 var SOUND_BUCKET = "http://public.highfidelity.io/sounds/Collisions-hitsandslaps/";
 var MAX_ANGULAR_SPEED = Math.PI;

script-archive/example/ui/overlaysExample.js

@@ -49,7 +49,7 @@ for (s = 0; s < numberOfSwatches; s++) {
                     width: 31,
                     height: 54,
                     subImage: { x: imageFromX, y: imageFromY, width: 30, height: 54 },
-                    imageURL: ExternalResource.getUrl(ExternalResource.Assets, "images/testing-swatches.svg"),
+                    imageURL: Script.getExternalPath(Script.ExternalPaths.Assets, "images/testing-swatches.svg"),
                     color: swatchColors[s],
                     alpha: 1
                 });
@@ -77,7 +77,7 @@ var toolA = Overlays.addOverlay("image", {
                     width: 62,
                     height: 40,
                     subImage: { x: 0, y: 0, width: 62, height: 40 },
-                    imageURL: ExternalResource.getUrl(ExternalResource.Assets, "images/hifi-interface-tools.svg"),
+                    imageURL: Script.getExternalPath(Script.ExternalPaths.Assets, "images/hifi-interface-tools.svg"),
                     color: { red: 255, green: 255, blue: 255},
                     visible: false
                 });
@@ -87,7 +87,7 @@ var toolA = Overlays.addOverlay("image", {
 var slider = Overlays.addOverlay("image", {
                     // alternate form of expressing bounds
                     bounds: { x: 100, y: 300, width: 158, height: 35},
-                    imageURL: ExternalResource.getUrl(ExternalResource.Assets, "images/slider.png"),
+                    imageURL: Script.getExternalPath(Script.ExternalPaths.Assets, "images/slider.png"),
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1
                 });
@@ -101,7 +101,7 @@ var thumb = Overlays.addOverlay("image", {
                     y: 309,
                     width: 18,
                     height: 17,
-                    imageURL: ExternalResource.getUrl(ExternalResource.Assets, "images/thumb.png"),
+                    imageURL: Script.getExternalPath(Script.ExternalPaths.Assets, "images/thumb.png"),
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1
                 });
@@ -197,8 +197,8 @@ print("Cube overlay color =\n"
 // This model overlay example causes intermittent crashes in NetworkGeometry::setTextureWithNameToURL()
 //var modelOverlayProperties = {
 //    textures: {
-//        filename1: ExternalResource.getUrl(ExternalResource.Assets, "images/testing-swatches.svg",)
+//        filename1: Script.getExternalPath(Script.ExternalPaths.Assets, "images/testing-swatches.svg",)
-//        filename2: ExternalResource.getUrl(ExternalResource.Assets, "images/hifi-interface-tools.svg")
+//        filename2: Script.getExternalPath(Script.ExternalPaths.Assets, "images/hifi-interface-tools.svg")
 //    }
 //}
 //var modelOverlay = Overlays.addOverlay("model", modelOverlayProperties);

script-archive/example/ui/textInputOverlayExample.js

@@ -180,7 +180,7 @@ function updateWriting(deltaTime){
         writing = writing + "\n";
     }
     // add blinking cursor to window during typing
-    var    addCursor = writing + cursor;
+    var addCursor = writing + cursor;
     if (clickedText == true){    
         Overlays.editOverlay(inputWindow, { text: addCursor});
     }else{

script-archive/fireworks.js

@@ -1,4 +1,4 @@
-var fireSound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.Assets, "sounds/Guns/GUN-SHOT2.raw"));
+var fireSound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Guns/GUN-SHOT2.raw"));
 var audioOptions = {
   volume: 0.9,
   position: Vec3.sum(Camera.getPosition(), Quat.getFront(Camera.getOrientation()))

script-archive/golfclub/golfClub.js

@@ -13,7 +13,7 @@
 
 (function () {
     var ball = null;
-    var collisionSoundURL = ExternalResource.getUrl(ExternalResource.Assets, "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav");
+    var collisionSoundURL = Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Collisions-ballhitsandcatches/billiards/collision1.wav");
     var triggerState = false;
     var BALL_GRAVITY = -9.8;
     var BALL_START_VELOCITY = 0.1;

script-archive/grenade.js

@@ -9,9 +9,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var grenadeURL = ExternalResource.getUrl(ExternalResource.Assets, "models/props/grenade/grenade.fbx");
+var grenadeURL = Script.getExternalPath(Script.ExternalPaths.Assets, "models/props/grenade/grenade.fbx");
-var fuseSoundURL = ExternalResource.getUrl(ExternalResource.Assets, "sounds/burningFuse.wav");
+var fuseSoundURL = Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/burningFuse.wav");
-var boomSoundURL = ExternalResource.getUrl(ExternalResource.Assets, "sounds/explosion.wav");
+var boomSoundURL = Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/explosion.wav");
 
 var AudioRotationOffset = Quat.fromPitchYawRollDegrees(0, -90, 0);
 var audioOptions = {

script-archive/libraries/constants.js

@@ -6,7 +6,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-STICK_URL = ExternalResource.getUrl(ExternalResource.Assets, "models/props/geo_stick.fbx");
+STICK_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "models/props/geo_stick.fbx");
 
 ZERO_VECTOR = { x: 0, y: 0, z: 0 };
 

script-archive/libraries/virtualKeyboard.js

@@ -22,8 +22,8 @@ KBD_UPPERCASE_HOVER   = 2;
 KBD_LOWERCASE_HOVER   = 3;
 KBD_BACKGROUND        = 4;
 
-KEYBOARD_URL = ExternalResource.getUrl(ExternalResource.Assets, "images/keyboard.svg");
+KEYBOARD_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "images/keyboard.svg");
-CURSOR_URL = ExternalResource.getUrl(ExternalResource.Assets, "images/cursor.svg");
+CURSOR_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "images/cursor.svg");
 
 RETURN_CHARCODE = 0x01000004;
 ENTER_CHARCODE = 0x01000005;

script-archive/lineRider.js

@@ -33,7 +33,7 @@ LineRider = function() {
     y: screenSize.y - (BUTTON_SIZE + PADDING),
     width: BUTTON_SIZE,
     height: BUTTON_SIZE,
-    imageURL: ExternalResource.getUrl(ExternalResource.Assets, "images/coaster.png?v2"),
+    imageURL: Script.getExternalPath(Script.ExternalPaths.Assets, "images/coaster.png?v2"),
     color: this.buttonOffColor,
     alpha: 1
   });

script-archive/lobby.js

@@ -43,16 +43,16 @@ var panelsCenterShift = Vec3.subtract(panelsCenter, orbCenter);
 
 var ORB_SHIFT = { x: 0, y: -1.4, z: -0.8};
 
-var LOBBY_PANEL_WALL_URL = ExternalResource.getUrl(ExternalResource.Assets, "models/sets/Lobby/PanelWallForInterface.fbx");
+var LOBBY_PANEL_WALL_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "models/sets/Lobby/PanelWallForInterface.fbx");
-var LOBBY_BLANK_PANEL_TEXTURE_URL = ExternalResource.getUrl(ExternalResource.Assets, "models/sets/Lobby/Texture.jpg");
+var LOBBY_BLANK_PANEL_TEXTURE_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "models/sets/Lobby/Texture.jpg");
-var LOBBY_SHELL_URL = ExternalResource.getUrl(ExternalResource.Assets, "models/sets/Lobby/LobbyShellForInterface.fbx");
+var LOBBY_SHELL_URL = Script.getExternalPath(Script.ExternalPaths.Assets, "models/sets/Lobby/LobbyShellForInterface.fbx");
 
-var droneSound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.Assets, "sounds/Lobby/drone.stereo.raw"));
+var droneSound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Lobby/drone.stereo.raw"));
 var currentDrone = null;
 
-var latinSound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.Assets, "sounds/Lobby/latin.stereo.raw"));
+var latinSound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Lobby/latin.stereo.raw"));
 var latinInjector = null;
-var elevatorSound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.Assets, "sounds/Lobby/elevator.stereo.raw"));
+var elevatorSound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Lobby/elevator.stereo.raw"));
 var elevatorInjector = null;
 var currentMuzakInjector = null;
 var currentSound = null;

script-archive/pointer.js

@@ -37,7 +37,7 @@ var toolBar = new ToolBar(0, 0, ToolBar.HORIZONTAL, "highfidelity.pointer.toolba
 var pointerButton = toolBar.addOverlay("image", {
   width: BUTTON_SIZE,
   height: BUTTON_SIZE,
-  imageURL: ExternalResource.getUrl(ExternalResource.Assets, "images/laser.png"),
+  imageURL: Script.getExternalPath(Script.ExternalPaths.Assets, "images/laser.png"),
   color: buttonOffColor,
   alpha: 1
 });

script-archive/recorder.js

@@ -24,7 +24,7 @@ function setDefaultPlayerOptions() {
 }
 
 var windowDimensions = Controller.getViewportDimensions();
-var TOOL_ICON_URL = ExternalResource.getUrl(ExternalResource.Assets, + "images/tools/");
+var TOOL_ICON_URL = Script.getExternalPath(Script.ExternalPaths.Assets, + "images/tools/");
 var ALPHA_ON = 1.0;
 var ALPHA_OFF = 0.7;
 var COLOR_ON = { red: 128, green: 0, blue: 0 };

script-archive/utilities/diagnostics/inWorldTestTone.js

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var sound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.Assets, "sounds/220Sine.wav"));
+var sound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/220Sine.wav"));
 
 var soundPlaying = false;
 

script-archive/utilities/diagnostics/moveJoints.js

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var testAnimation = ExternalResource.getUrl(ExternalResource.Assets, "ozan/animations/forStephen/sniperJump.fbx");
+var testAnimation = Script.getExternalPath(Script.ExternalPaths.Assets, "ozan/animations/forStephen/sniperJump.fbx");
 
 var FRAME_RATE = 24.0; // frames per second
 var isAnimating = false;

script-archive/utilities/diagnostics/playSoundLoop.js

@@ -14,9 +14,9 @@
 
 //  A few sample files you may want to try: 
 
-var sound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.Assets, "sounds/Guitars/Guitar+-+Nylon+A.raw"));
+var sound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Guitars/Guitar+-+Nylon+A.raw"));
-//var sound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.Assets, "sounds/220Sine.wav"));
+//var sound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/220Sine.wav"));
-//var sound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.Assets, "sounds/Cocktail+Party+Snippets/Bandcamp.wav"));
+//var sound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Cocktail+Party+Snippets/Bandcamp.wav"));
 
 var soundPlaying = false;
 var options = {

script-archive/utilities/diagnostics/playSoundWave.js

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var soundClip = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.Assets, "sounds/Cocktail%20Party%20Snippets/Walken1.wav"));
+var soundClip = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.Assets, "sounds/Cocktail%20Party%20Snippets/Walken1.wav"));
 
 function playSound() {
     Audio.playSound(soundClip, {

script-archive/utilities/tools/cookies.js

@@ -782,7 +782,7 @@ var CHECK_MARK_COLOR = {
                 green: 255,
                 blue: 255
             },
-            imageURL: ExternalResource.getUrl(ExternalResource.Assets, 'images/tools/expand-ui.svg'),
+            imageURL: Script.getExternalPath(Script.ExternalPaths.Assets, 'images/tools/expand-ui.svg'),
             x: x,
             y: y,
             width: rawHeight,
@@ -1145,13 +1145,13 @@ var CHECK_MARK_COLOR = {
 
             if (!item.isCollapsed && item.isCollapsable && clickedOverlay == item.thumb) {
                 Overlays.editOverlay(item.thumb, {
-                    imageURL: ExternalResource.getUrl(ExternalResource.Assets, 'images/tools/expand-right.svg')
+                    imageURL: Script.getExternalPath(Script.ExternalPaths.Assets, 'images/tools/expand-right.svg')
                 });
                 this.collapse(clickedOverlay);
                 item.isCollapsed = true;
             } else if (item.isCollapsed && item.isCollapsable && clickedOverlay == item.thumb) {
                 Overlays.editOverlay(item.thumb, {
-                    imageURL: ExternalResource.getUrl(ExternalResource.Assets, 'images/tools/expand-ui.svg')
+                    imageURL: Script.getExternalPath(Script.ExternalPaths.Assets, 'images/tools/expand-ui.svg')
                 });
                 this.expand(clickedOverlay);
                 item.isCollapsed = false;

script-archive/walk.js

@@ -14,7 +14,7 @@
 //
 
 // animations, reach poses, reach pose parameters, transitions, transition parameters, sounds, image/s and reference files
-var pathToAssets = ExternalResource.getUrl(ExternalResource.Assets, "procedural-animator/assets/");
+var pathToAssets = Script.getExternalPath(Script.ExternalPaths.Assets, "procedural-animator/assets/");
 
 Script.include([
     "./libraries/walkConstants.js",

scripts/developer/accelerationFilterApp.js

@@ -82,13 +82,13 @@ var mappingJson = {
 //
 
 var TABLET_BUTTON_NAME = "ACCFILT";
-var HTML_URL = ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/html/accelerationFilterApp.html?2");
+var HTML_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/html/accelerationFilterApp.html?2");
 
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var tabletButton = tablet.addButton({
     text: TABLET_BUTTON_NAME,
-    icon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/tpose-i.svg"),
+    icon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/tpose-i.svg"),
-    activeIcon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/tpose-a.svg")
+    activeIcon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/tpose-a.svg")
 });
 
 tabletButton.clicked.connect(function () {

scripts/developer/automaticLookAt.js

@@ -39,8 +39,8 @@
     var LookAtDebugger = function() {
         var self = this;
         var IMAGE_DIMENSIONS = {x: 0.2, y: 0.2, z:0.2};
-        var TARGET_ICON_PATH = ExternalResource.getUrl(ExternalResource.HF_Content, "/luis/test_scripts/LookAtApp/eyeFocus.png");
+        var TARGET_ICON_PATH = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/luis/test_scripts/LookAtApp/eyeFocus.png");
-        var INFINITY_ICON_PATH = ExternalResource.getUrl(ExternalResource.HF_Content, "/luis/test_scripts/LookAtApp/noFocus.png");
+        var INFINITY_ICON_PATH = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/luis/test_scripts/LookAtApp/noFocus.png");
         this.items = {};
         this.active = false;
         

scripts/developer/exponentialFilterApp.js

@@ -89,13 +89,13 @@ var mappingJson = {
 //
 
 var TABLET_BUTTON_NAME = "EXPFILT";
-var HTML_URL = ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/html/exponentialFilterApp.html?7");
+var HTML_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/html/exponentialFilterApp.html?7");
 
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var tabletButton = tablet.addButton({
     text: TABLET_BUTTON_NAME,
-    icon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/tpose-i.svg"),
+    icon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/tpose-i.svg"),
-    activeIcon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/tpose-a.svg")
+    activeIcon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/tpose-a.svg")
 });
 
 tabletButton.clicked.connect(function () {

scripts/developer/facialExpressions.js

@@ -20,8 +20,8 @@
     var TRANSITION_TIME_SECONDS = 0.25;
 
     var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-    var icon = ExternalResource.getUrl(ExternalResource.HF_Content, "/elisalj/emoji_scripts/icons/emoji-i.svg");
+    var icon = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/elisalj/emoji_scripts/icons/emoji-i.svg");
-    var activeIcon = ExternalResource.getUrl(ExternalResource.HF_Content, "/elisalj/emoji_scripts/icons/emoji-a.svg");
+    var activeIcon = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/elisalj/emoji_scripts/icons/emoji-a.svg");
     var isActive = true;
 
     var controllerMappingName;

scripts/developer/tests/agentAPITest.js

@@ -7,7 +7,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-var SOUND_DATA = { url: ExternalResource.getUrl(ExternalResource.HF_Content, "/howard/sounds/piano1.wav") };
+var SOUND_DATA = { url: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/howard/sounds/piano1.wav") };
 
 // getSound function from crowd-agent.js
 function getSound(data, callback) { // callback(sound) when downloaded (which may be immediate).

scripts/developer/tests/avatarAttachmentTest.js

@@ -76,20 +76,20 @@ var buttonPositionX = windowDimensions.x - BUTTON_PADDING - BUTTON_WIDTH;
 var buttonPositionY = (windowDimensions.y - BUTTON_HEIGHT) / 2 - (BUTTON_HEIGHT + BUTTON_PADDING);
 
 var hatButton = new ToggleButtonBuddy(buttonPositionX, buttonPositionY, BUTTON_WIDTH, BUTTON_HEIGHT, {
-    up: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/hat-up.svg"),
+    up: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/hat-up.svg"),
-    down: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/hat-down.svg")
+    down: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/hat-down.svg")
 });
 
 buttonPositionY += BUTTON_HEIGHT + BUTTON_PADDING;
 var coatButton = new ToggleButtonBuddy(buttonPositionX, buttonPositionY, BUTTON_WIDTH, BUTTON_HEIGHT, {
-    up: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/coat-up.svg"),
+    up: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/coat-up.svg"),
-    down: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/coat-down.svg")
+    down: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/coat-down.svg")
 });
 
 buttonPositionY += BUTTON_HEIGHT + BUTTON_PADDING;
 var coatButton2 = new ToggleButtonBuddy(buttonPositionX, buttonPositionY, BUTTON_WIDTH, BUTTON_HEIGHT, {
-    up: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/coat-up.svg"),
+    up: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/coat-up.svg"),
-    down: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/coat-down.svg")
+    down: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/coat-down.svg")
 });
 
 var AVATAR_ATTACHMENT = 0;
@@ -97,7 +97,7 @@ var AVATAR_SOFT_ATTACHMENT = 1;
 var ENTITY_ATTACHMENT = 2;
 
 var HAT_ATTACHMENT = {
-    modelURL: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/cowboy-hat.fbx"),
+    modelURL: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/cowboy-hat.fbx"),
     jointName: "Head",
     translation: {"x": 0, "y": 0.25, "z": 0.03},
     rotation: {"x": 0, "y": 0, "z": 0, "w": 1},
@@ -106,7 +106,7 @@ var HAT_ATTACHMENT = {
 };
 
 var COAT_ATTACHMENT = {
-    modelURL: ExternalResource.getUrl(ExternalResource.HF_Content, "/ozan/dev/clothes/coat/coat_rig.fbx"),
+    modelURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/ozan/dev/clothes/coat/coat_rig.fbx"),
     jointName: "Hips",
     translation: {"x": 0, "y": 0, "z": 0},
     rotation: {"x": 0, "y": 0, "z": 0, "w": 1},
@@ -115,7 +115,7 @@ var COAT_ATTACHMENT = {
 };
 
 var COAT_ENTITY_ATTACHMENT = {
-    modelURL: ExternalResource.getUrl(ExternalResource.HF_Content, "/ozan/dev/clothes/coat/coat_rig.fbx"),
+    modelURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/ozan/dev/clothes/coat/coat_rig.fbx"),
     jointName: "Hips",
     translation: {"x": 0, "y": 0, "z": 0},
     rotation: {"x": 0, "y": 0, "z": 0, "w": 1},

scripts/developer/tests/batonSoundEntityTest/batonSoundTestEntityScript.js

@@ -7,7 +7,7 @@
     var _this;
     BatonSoundEntity = function() {
         _this = this;
-        _this.drumSound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Public, "/sounds/Drums/deepdrum1.wav"));
+        _this.drumSound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Public, "/sounds/Drums/deepdrum1.wav"));
         _this.injectorOptions = {position: MyAvatar.position, loop: false, volume: 1};
         _this.soundIntervalConnected = false;
         _this.batonDebugModel = Entities.addEntity({

scripts/developer/tests/filtered-puck-attach.js

@@ -17,14 +17,14 @@ Script.include("/~/system/libraries/Xform.js");
 (function() { // BEGIN LOCAL_SCOPE
 
 var TABLET_BUTTON_NAME = "PUCKATTACH";
-var TABLET_APP_URL = ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/html/filtered-puck-attach.html?2");
+var TABLET_APP_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/html/filtered-puck-attach.html?2");
 var NUM_TRACKED_OBJECTS = 16;
 
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var tabletButton = tablet.addButton({
     text: TABLET_BUTTON_NAME,
-    icon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/puck-i.svg"),
+    icon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/puck-i.svg"),
-    activeIcon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/puck-a.svg")
+    activeIcon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/puck-a.svg")
 });
 
 var shown = false;
@@ -87,7 +87,7 @@ function entityExists(entityID) {
     return Object.keys(Entities.getEntityProperties(entityID)).length > 0;
 }
 
-var VIVE_PUCK_MODEL = ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/vive_tracker_puck_y180z180.obj");
+var VIVE_PUCK_MODEL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/vive_tracker_puck_y180z180.obj");
 var VIVE_PUCK_DIMENSIONS = { x: 0.0945, y: 0.0921, z: 0.0423 }; // 1/1000th scale of model
 var VIVE_PUCK_SEARCH_DISTANCE = 1.5; // metres
 var VIVE_PUCK_SPAWN_DISTANCE = 0.5; // metres

scripts/developer/tests/injectorTest.js

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var soundURL = ExternalResource.getUrl(ExternalResource.HF_Public, "/birarda/medium-crowd.wav");
+var soundURL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/birarda/medium-crowd.wav");
 var audioOptions = {
     position: { x: 0.0, y: 0.0, z: 0.0 },
     volume: 0.5

scripts/developer/tests/performance/domain-check.js

@@ -26,12 +26,12 @@ var MINIMUM_AVATARS = 25; // changeable by prompt
 var SPREAD_TIME_MS = 500;
 
 var DENSITY = 0.3; // square meters per person. Some say 10 sq ft is arm's length (0.9m^2), 4.5 is crowd (0.4m^2), 2.5 is mosh pit (0.2m^2).
-var SOUND_DATA = {url: ExternalResource.getUrl(ExternalResource.HF_Content, "/howard/sounds/piano1.wav"};
+var SOUND_DATA = {url: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/howard/sounds/piano1.wav"};
 var AVATARS_CHATTERING_AT_ONCE = 4; // How many of the agents should we request to play SOUND at once.
 var NEXT_SOUND_SPREAD = 500; // millisecond range of how long to wait after one sound finishes, before playing the next
 var ANIMATION_DATA = {
-    "url": ExternalResource.getUrl(ExternalResource.HF_Content, "/howard/resources/avatar/animations/idle.fbx"),
+    "url": Script.getExternalPath(Script.ExternalPaths.HF_Content, "/howard/resources/avatar/animations/idle.fbx"),
-    // "url": ExternalResource.getUrl(ExternalResource.HF_Content, "/howard/resources/avatar/animations/walk_fwd.fbx"), // alternative example
+    // "url": Script.getExternalPath(Script.ExternalPaths.HF_Content, "/howard/resources/avatar/animations/walk_fwd.fbx"), // alternative example
     "startFrame": 0.0,
     "endFrame": 300.0,
     "timeScale": 1.0,
@@ -128,7 +128,7 @@ function messageHandler(channel, messageString, senderID) {
                     orientation: Quat.fromPitchYawRollDegrees(0, Quat.safeEulerAngles(MyAvatar.orientation).y + (turnSpread * (Math.random() - 0.5)), 0),
                     soundData: chatter && SOUND_DATA,
                     listen: true,
-                    skeletonModelURL: ExternalResource.getUrl(ExternalResource.HF_Content, "/howard/resources/meshes/defaultAvatar_full.fst"),
+                    skeletonModelURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/howard/resources/meshes/defaultAvatar_full.fst"),
                     animationData: ANIMATION_DATA
                 });
             }

scripts/developer/tests/performance/rayPickPerformance.js

@@ -22,7 +22,7 @@ var EXPECTED_INTERSECTIONS = 1286 * OUTER_LOOPS;
 
 
 var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(Camera.getOrientation())));
-var model_url = ExternalResource.getUrl(ExternalResource.HF_Content, "/caitlyn/production/Scansite/buddhaReduced.fbx");
+var model_url = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/caitlyn/production/Scansite/buddhaReduced.fbx");
 
 var rayPickOverlays = Array();
 

scripts/developer/tests/performance/summon.js

@@ -31,11 +31,11 @@ debug('startup seeking:', MINIMUM_AVATARS, 'listening:', N_LISTENING, 'chatterin
 var SPREAD_TIME_MS = 500;
 
 var DENSITY = 0.3; // square meters per person. Some say 10 sq ft is arm's length (0.9m^2), 4.5 is crowd (0.4m^2), 2.5 is mosh pit (0.2m^2).
-var SOUND_DATA = {url: ExternalResource.getUrl(ExternalResource.HF_Content, "/howard/sounds/piano1.wav")};
+var SOUND_DATA = {url: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/howard/sounds/piano1.wav")};
 var NEXT_SOUND_SPREAD = 500; // millisecond range of how long to wait after one sound finishes, before playing the next
 var ANIMATION_DATA = {
-    "url": ExternalResource.getUrl(ExternalResource.HF_Content, "/howard/resources/avatar/animations/idle.fbx"),
+    "url": Script.getExternalPath(Script.ExternalPaths.HF_Content, "/howard/resources/avatar/animations/idle.fbx"),
-    // "url": ExternalResource.getUrl(ExternalResource.HF_Content, "/howard/resources/avatar/animations/walk_fwd.fbx"), // alternative example
+    // "url": Script.getExternalPath(Script.ExternalPaths.HF_Content, "/howard/resources/avatar/animations/walk_fwd.fbx"), // alternative example
     "startFrame": 0.0,
     "endFrame": 300.0,
     "timeScale": 1.0,
@@ -100,7 +100,7 @@ function messageHandler(channel, messageString, senderID) {
                     orientation: Quat.fromPitchYawRollDegrees(0, Quat.safeEulerAngles(MyAvatar.orientation).y + (turnSpread * (Math.random() - 0.5)), 0),
                     soundData: chatter && SOUND_DATA,
                     listen: listen,
-                    skeletonModelURL: ExternalResource.getUrl(ExternalResource.HF_Content, "/howard/resources/meshes/defaultAvatar_full.fst"),
+                    skeletonModelURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/howard/resources/meshes/defaultAvatar_full.fst"),
                     animationData: ANIMATION_DATA
                 });
             }

scripts/developer/tests/puck-attach.js

@@ -17,13 +17,13 @@ Script.include("/~/system/libraries/Xform.js");
 (function() { // BEGIN LOCAL_SCOPE
 
 var TABLET_BUTTON_NAME = "PUCKTACH";
-var TABLET_APP_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/seefo/production/puck-attach/puck-attach.html");
+var TABLET_APP_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/seefo/production/puck-attach/puck-attach.html");
 
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var tabletButton = tablet.addButton({
     text: TABLET_BUTTON_NAME,
-    icon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/puck-i.svg"),
+    icon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/puck-i.svg"),
-    activeIcon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/puck-a.svg")
+    activeIcon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/puck-a.svg")
 });
 
 var shown = false;
@@ -85,7 +85,7 @@ function entityExists(entityID) {
     return Object.keys(Entities.getEntityProperties(entityID)).length > 0;
 }
 
-var VIVE_PUCK_MODEL = ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/vive_tracker_puck_y180z180.obj");
+var VIVE_PUCK_MODEL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/vive_tracker_puck_y180z180.obj");
 var VIVE_PUCK_DIMENSIONS = { x: 0.0945, y: 0.0921, z: 0.0423 }; // 1/1000th scale of model
 var VIVE_PUCK_SEARCH_DISTANCE = 1.5; // metres
 var VIVE_PUCK_SPAWN_DISTANCE = 0.5; // metres

scripts/developer/tests/rapidProceduralChange/rapidProceduralChangeTest.js

@@ -25,8 +25,8 @@ centerUp.y += 0.5;
 var centerDown = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getForward(orientation)));
 centerDown.y -= 0.5;
 
-var ENTITY_SHADER_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/eric/shaders/uniformTest.fs");
+var ENTITY_SHADER_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/eric/shaders/uniformTest.fs");
-var SKYBOX_SHADER_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/eric/shaders/timerTest.fs");
+var SKYBOX_SHADER_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/eric/shaders/timerTest.fs");
 
 var entityData = {
     ProceduralEntity: {

scripts/developer/tests/scriptableResource/lib.js

@@ -56,7 +56,7 @@ function getFrame(callback) {
 
 function prefetch(callback) {
     // A folder full of individual frames.
-    var MOVIE_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/james/vidtest/");
+    var MOVIE_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/james/vidtest/");
 
     var frames = [];
 

scripts/developer/tests/skybox/skyboxTest.js

@@ -27,7 +27,7 @@ var PX_RGBA_URL = Script.resolvePath('px_rgba.fs');
 var PX_TEX_URL = Script.resolvePath('px_tex.fs');
 var PX_TEX_RGBA_URL = Script.resolvePath('px_tex_rgba.fs');
 
-var TEX_URL = ExternalResource.getUrl(ExternalResource.HF_Public, "/alan/Playa/Skies/Test-Sky_out.png");
+var TEX_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/alan/Playa/Skies/Test-Sky_out.png");
 var NO_TEX = '';
 
 var COLOR = { red: 255, green: 0, blue: 255 };

scripts/developer/tests/tabletEventBridgeTest.js

@@ -17,13 +17,13 @@
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var tabletButton = tablet.addButton({
     text: "SOUNDS",
-    icon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/trombone-i.png"),
+    icon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/trombone-i.png"),
-    activeIcon: ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/icons/trombone-a.png")
+    activeIcon: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/icons/trombone-a.png")
 });
 
-var WEB_BRIDGE_TEST_HTML = ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/webBridgeTest.html?2");
+var WEB_BRIDGE_TEST_HTML = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/webBridgeTest.html?2");
-var TROMBONE_URL = ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/audio/sad-trombone.wav");
+var TROMBONE_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/audio/sad-trombone.wav");
-var SCREAM_URL = ExternalResource.getUrl(ExternalResource.HF_Public, "/tony/audio/wilhelm-scream.wav");
+var SCREAM_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/tony/audio/wilhelm-scream.wav");
 
 tabletButton.clicked.connect(function () {
     if (shown) {

scripts/developer/utilities/tools/cookies.js

@@ -10,7 +10,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+
 
 var SLIDER_RANGE_INCREMENT_SCALE = 1 / 1000;
 var THUMB_COLOR = {
@@ -784,7 +784,7 @@ var CHECK_MARK_COLOR = {
                 green: 255,
                 blue: 255
             },
-            imageURL: ExternalResource.getUrl(ExternalResource.HF_Public, 'images/tools/expand-ui.svg'),
+            imageURL: Script.getExternalPath(Script.ExternalPaths.HF_Public, 'images/tools/expand-ui.svg'),
             x: x,
             y: y,
             width: rawHeight,
@@ -1147,13 +1147,13 @@ var CHECK_MARK_COLOR = {
 
             if (!item.isCollapsed && item.isCollapsable && clickedOverlay == item.thumb) {
                 Overlays.editOverlay(item.thumb, {
-                    imageURL: ExternalResource.getUrl(ExternalResource.HF_Public, 'images/tools/expand-right.svg')
+                    imageURL: Script.getExternalPath(Script.ExternalPaths.HF_Public, 'images/tools/expand-right.svg')
                 });
                 this.collapse(clickedOverlay);
                 item.isCollapsed = true;
             } else if (item.isCollapsed && item.isCollapsable && clickedOverlay == item.thumb) {
                 Overlays.editOverlay(item.thumb, {
-                    imageURL: ExternalResource.getUrl(ExternalResource.HF_Public, 'images/tools/expand-ui.svg')
+                    imageURL: Script.getExternalPath(Script.ExternalPaths.HF_Public, 'images/tools/expand-ui.svg')
                 });
                 this.expand(clickedOverlay);
                 item.isCollapsed = false;

scripts/developer/utilities/tools/disableAvatarAnimations.js

@@ -15,7 +15,7 @@ var skeletonModelURL = "";
 var jointCount = 0;
 
 var excludedRoles = ["rightHandGraspOpen", "rightHandGraspClosed", "leftHandGraspOpen", "leftHandGraspClosed"];
-var IDLE_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/ozan/dev/anim/standard_anims_160127/idle.fbx");
+var IDLE_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/ozan/dev/anim/standard_anims_160127/idle.fbx");
 
 function overrideAnims() {
     var roles = MyAvatar.getAnimationRoles();

scripts/developer/utilities/workload/test_physics_scene.js

@@ -85,7 +85,7 @@ function addObject(a, b, c, lifetime) {
             rotation: stageOrientation,    
             dimensions: OBJECT_DIM,
             lifetime: (lifetime === undefined) ? DEFAULT_LIFETIME : lifetime,
-            modelURL: ExternalResource.getUrl(ExternalResource.HF_Content, "/jimi/props/cones/trafficCone.fbx"),
+            modelURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/jimi/props/cones/trafficCone.fbx"),
             shapeType:shapeTypes[4],
             dynamic: true,
             gravity:{"x":0,"y":-9.8,"z":0},

scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js

@@ -22,8 +22,7 @@ var EasingFunctions = Script.require("./resources/modules/easing.js");
 var emojiList = Script.require("./resources/modules/emojiList.js");
 var customEmojiList = Script.require("./resources/modules/customEmojiList.js");
 // The contents of this remote folder must always contain all possible emojis for users of `simplifiedEmoji.js`
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+var imageURLBase = Script.getExternalPath(Script.ExternalPaths.HF_Content, "MarketplaceItems/avimoji/appResources/appData/resources/images/emojis/png512/");
-var imageURLBase = networkingConstants.CONTENT_CDN_URL + "MarketplaceItems/avimoji/appResources/appData/resources/images/emojis/png512/";
 // Uncomment below for local testing
 //imageURLBase = Script.resolvePath("./resources/images/emojis/512px/");
 

scripts/system/audio.js

@@ -14,7 +14,7 @@
 (function() { // BEGIN LOCAL_SCOPE
 
 var TABLET_BUTTON_NAME = "AUDIO";
-var HOME_BUTTON_TEXTURE = ExternalResource.getUrl(ExternalResource.HF_Content, "/alan/dev/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png");
+var HOME_BUTTON_TEXTURE = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png");
 var AUDIO_QML_SOURCE = "hifi/audio/Audio.qml";
 
 var MUTE_ICONS = {

scripts/system/avatarFinderBeacon.js

@@ -20,8 +20,8 @@ var beacons = {};
 
 // List of .fst files used by AC scripts, that should be ignored in the script in case TRY_TO_IGNORE_AC_AGENTS is enabled
 var POSSIBLE_AC_AVATARS = [
-    ExternalResource.getUrl(ExternalResource.HF_Content, "/ozan/dev/avatars/invisible_avatar/invisible_avatar.fst"),
+    Script.getExternalPath(Script.ExternalPaths.HF_Content, "/ozan/dev/avatars/invisible_avatar/invisible_avatar.fst"),
-    ExternalResource.getUrl(ExternalResource.HF_Content, "/ozan/dev/avatars/camera_man/pod/_latest/camera_man_pod.fst")
+    Script.getExternalPath(Script.ExternalPaths.HF_Content, "/ozan/dev/avatars/camera_man/pod/_latest/camera_man_pod.fst")
 ];
 
 AvatarFinderBeacon = function(avatar) {

scripts/system/commerce/wallet.js

@@ -338,7 +338,7 @@ var SEND_MONEY_PARTICLE_PROPERTIES = {
     radiusSpread: 0,
     radiusStart: 0.2,
     speedSpread: 0,
-    textures: ExternalResource.getUrl(ExternalResource.HF_Content, "/alan/dev/Particles/Bokeh-Particle-HFC.png"),
+    textures: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/Particles/Bokeh-Particle-HFC.png"),
     type: 'ParticleEffect'
 };
 

scripts/system/controllers/controllerModules/equipEntity.js

@@ -20,7 +20,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
 Script.include("/~/system/libraries/utils.js");
 
 
-var DEFAULT_SPHERE_MODEL_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/alan/dev/equip-Fresnel-3.fbx");
+var DEFAULT_SPHERE_MODEL_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/equip-Fresnel-3.fbx");
 var EQUIP_SPHERE_SCALE_FACTOR = 0.65;
 
 

scripts/system/controllers/grab.js

@@ -164,8 +164,8 @@ var beacon = {
 };
 
 // TODO: play sounds again when we aren't leaking AudioInjector threads
-// var grabSound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Public, "/eric/sounds/CloseClamp.wav"));
+// var grabSound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Public, "/eric/sounds/CloseClamp.wav"));
-// var releaseSound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Public, "/eric/sounds/ReleaseClamp.wav"));
+// var releaseSound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Public, "/eric/sounds/ReleaseClamp.wav"));
 // var VOLUME = 0.0;
 
 

scripts/system/create/edit.js

@@ -44,8 +44,8 @@ var CREATE_TOOLS_WIDTH = 490;
 var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942;
 var ENTIRE_DOMAIN_SCAN_RADIUS = 27713;
 
-var DEFAULT_IMAGE = ExternalResource.getUrl(ExternalResource.Assets, "interface/default/default_image.jpg");
+var DEFAULT_IMAGE = Script.getExternalPath(Script.ExternalPaths.Assets, "interface/default/default_image.jpg");
-var DEFAULT_PARTICLE = ExternalResource.getUrl(ExternalResource.Assets, "interface/default/default_particle.png");
+var DEFAULT_PARTICLE = Script.getExternalPath(Script.ExternalPaths.Assets, "interface/default/default_particle.png");
 
 var createToolsWindow = new CreateWindow(
     Script.resolvePath("qml/EditTools.qml"),

scripts/system/libraries/WebTablet.js

@@ -37,7 +37,7 @@ var TABLET_NATURAL_DIMENSIONS = {x: 32.083, y: 48.553, z: 2.269};
 
 var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "images/button-close.png";
 // var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-close.png";
-// var TABLET_MODEL_PATH = ExternalResource.getUrl(ExternalResource.HF_Content, "/alan/dev/tablet-with-home-button.fbx");
+// var TABLET_MODEL_PATH = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/tablet-with-home-button.fbx");
 
 var LOCAL_TABLET_MODEL_PATH = Script.resourcesPath() + "meshes/tablet-with-home-button-small-bezel.fbx";
 var HIGH_PRIORITY = 1;

scripts/system/libraries/globals.js

@@ -8,6 +8,4 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+isInterstitialOverlaysVisible = false;
-
-isInterstitialOverlaysVisible = false;

scripts/system/libraries/networkingConstants.js

@@ -10,15 +10,11 @@
 var INTERFACE_METADATA_SOURCE = "https://cdn.vircadia.com/dist/launcher/vircadiaMeta.json";
 
 // Base CDN URLs
-var CONTENT_CDN_URL = ExternalResource.HF_Content; // "https://cdn-1.vircadia.com/" + usCDN;
+var CONTENT_CDN_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/"); // "https://cdn-1.vircadia.com/" + usCDN;
-var PUBLIC_BUCKET_CDN_URL = ExternalResource.HF_Public;
+var PUBLIC_BUCKET_CDN_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, "/");
-var euCDN = "eu-c-1/";
-var usCDN = "us-c-1/";
 
 module.exports = {
-    INTERFACE_METADATA_SOURCE: INTERFACE_METADATA_SOURCE.
+    INTERFACE_METADATA_SOURCE: INTERFACE_METADATA_SOURCE,
     CONTENT_CDN_URL: CONTENT_CDN_URL,
-    PUBLIC_BUCKET_CDN_URL: PUBLIC_BUCKET_CDN_URL,
+    PUBLIC_BUCKET_CDN_URL: PUBLIC_BUCKET_CDN_URL
-    euCDN: euCDN,
-    usCDN: usCDN
 }

scripts/system/libraries/progressDialog.js

@@ -8,8 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-var var networkingConstants = Script.require("/~/system/libraries/networkingConstants.js");
+var toolIconUrl = Script.getExternalPath(Script.ExternalPaths.HF_Public, "images/tools/");
-var toolIconUrl = ExternalResource.getUrl(ExternalResource.HF_Public, "images/tools/");
 
 progressDialog = (function () {
     var that = {},

scripts/system/makeUserConnection.js

@@ -35,8 +35,8 @@
     var CONNECTING_TIME = 100; // ms One interval.
     var PARTICLE_RADIUS = 0.15; // m
     var PARTICLE_ANGLE_INCREMENT = 360 / 45; // 1hz
-    var HANDSHAKE_SOUND_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/davidkelly/production/audio/4beat_sweep.wav");
+    var HANDSHAKE_SOUND_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/davidkelly/production/audio/4beat_sweep.wav");
-    var SUCCESSFUL_HANDSHAKE_SOUND_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/davidkelly/production/audio/3rdbeat_success_bell.wav");
+    var SUCCESSFUL_HANDSHAKE_SOUND_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/davidkelly/production/audio/3rdbeat_success_bell.wav");
     var PREFERRER_HAND_JOINT_POSTFIX_ORDER = ['Middle1', 'Index1', ''];
     var HAPTIC_DATA = {
         initial: { duration: 20, strength: 0.6 }, // duration is in ms
@@ -60,7 +60,7 @@
         "radiusStart": 0.0025,
         "emitSpeed": 0.02,
         "speedSpread": 0.015,
-        "textures": ExternalResource.getUrl(ExternalResource.HF_Content, "/alan/dev/Particles/Bokeh-Particle.png"),
+        "textures": Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/Particles/Bokeh-Particle.png"),
         "color": {"red": 255, "green": 255, "blue": 255},
         "colorFinish": {"red": 0, "green": 164, "blue": 255},
         "colorStart": {"red": 255, "green": 255, "blue": 255},
@@ -92,7 +92,7 @@
         "radiusStart": 0.04,
         "speedSpread": 0.00,
         "radiusSpread": 0.0,
-        "textures": ExternalResource.getUrl(ExternalResource.HF_Content, "/alan/dev/Particles/Bokeh-Particle.png"),
+        "textures": Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/Particles/Bokeh-Particle.png"),
         "color": {"red": 200, "green": 170, "blue": 255},
         "colorFinish": {"red": 0, "green": 134, "blue": 255},
         "colorStart": {"red": 185, "green": 222, "blue": 255},

scripts/system/menu.js

@@ -13,7 +13,7 @@
 
 /* global Script, HMD, Tablet, Entities */
 
-var HOME_BUTTON_TEXTURE = ExternalResource.getUrl(ExternalResource.HF_Content, "/alan/dev/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png");
+var HOME_BUTTON_TEXTURE = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png");
 // var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
 
 (function() {

scripts/system/snapshot.js

@@ -271,7 +271,7 @@ function onMessage(message) {
 }
 
 var POLAROID_PRINT_SOUND = SoundCache.getSound(Script.resourcesPath() + "sounds/snapshot/sound-print-photo.wav");
-var POLAROID_MODEL_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/alan/dev/Test/snapshot.fbx");
+var POLAROID_MODEL_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/alan/dev/Test/snapshot.fbx");
 var POLAROID_RATE_LIMIT_MS = 1000;
 var polaroidPrintingIsRateLimited = false;
 

scripts/system/tablet-users.js

@@ -11,7 +11,7 @@
 //
 
 (function() { // BEGIN LOCAL_SCOPE
-    var USERS_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/faye/tablet-dev/users.html");
+    var USERS_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/faye/tablet-dev/users.html");
     var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
 
     var FRIENDS_WINDOW_URL = Account.metaverseServerURL + "/user/friends";

scripts/tutorials/createFloatingLanternBox.js

@@ -13,8 +13,8 @@
 // Distributed under the Apache License, Version 2.0.
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-var COMPOUND_SHAPE_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/Examples%20Content/production/maracas/woodenCrate_phys.obj");
+var COMPOUND_SHAPE_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/Examples%20Content/production/maracas/woodenCrate_phys.obj");
-var MODEL_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/Examples%20Content/production/maracas/woodenCrate_VR.fbx");
+var MODEL_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/Examples%20Content/production/maracas/woodenCrate_VR.fbx");
 var SCRIPT_URL = Script.resolvePath("./entity_scripts/floatingLanternBox.js?v=" + Date.now());
 var START_POSITION = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getFront(MyAvatar.orientation), 2));
 START_POSITION.y -= .6;

scripts/tutorials/createTetherballStick.js

@@ -24,7 +24,7 @@ var ACTION_DISTANCE = 0.35;
 var ACTION_TIMESCALE = 0.035;
 var MAX_DISTANCE_MULTIPLIER = 4;
 var STICK_SCRIPT_URL = Script.resolvePath("./entity_scripts/tetherballStick.js");
-var STICK_MODEL_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/caitlyn/production/raveStick/newRaveStick2.fbx");
+var STICK_MODEL_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/caitlyn/production/raveStick/newRaveStick2.fbx");
 var COLLISION_SOUND_URL = "http://public.highfidelity.io/sounds/Footsteps/FootstepW3Left-12db.wav";
 
 var avatarOrientation = MyAvatar.orientation;
@@ -37,7 +37,7 @@ var ballStartPosition = Vec3.sum(stickStartPosition, Vec3.multiply(0.36, front))
 
 var ballID = Entities.addEntity({
     type: "Model",
-    modelURL: ExternalResource.getUrl(ExternalResource.HF_Content, "/Examples%20Content/production/marblecollection/Star.fbx"),
+    modelURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/Examples%20Content/production/marblecollection/Star.fbx"),
     name: "TetherballStick Ball",
     shapeType: "Sphere",
     position: ballStartPosition,
@@ -70,7 +70,7 @@ var lineID = Entities.addEntity({
         green: 120,
         blue: 250
     },
-    textures: ExternalResource.getUrl(ExternalResource.HF_Public, "/alan/Particles/Particle-Sprite-Smoke-1.png"),
+    textures: Script.getExternalPath(Script.ExternalPaths.HF_Public, "/alan/Particles/Particle-Sprite-Smoke-1.png"),
     position: ballStartPosition,
     dimensions: {
         x: 10,

scripts/tutorials/entity_scripts/ambientSound.js

@@ -24,7 +24,7 @@
 (function(){
     //  This sample clip and range will be used if you don't add userData to the entity (see above)
     var DEFAULT_RANGE = 100;
-    var DEFAULT_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/ken/samples/forest_ambiX.wav");
+    var DEFAULT_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/ken/samples/forest_ambiX.wav");
     var DEFAULT_VOLUME = 1.0;
 
     var DEFAULT_USERDATA = {

scripts/tutorials/entity_scripts/flashlight.js

@@ -8,7 +8,7 @@
 //  Copyright 2015 High Fidelity, Inc.
 //
 //  This is a toy script that can be added to the Flashlight model entity:
-//  ExternalResource.getUrl(ExternalResource.HF_Public, "/models/props/flashlight.fbx")
+//  Script.getExternalPath(Script.ExternalPaths.HF_Public, "/models/props/flashlight.fbx")
 //  that creates a spotlight attached with the flashlight model while the entity is grabbed
 //
 //  Distributed under the Apache License, Version 2.0.
@@ -17,8 +17,8 @@
 
 (function() {
 
-    var ON_SOUND_URL = ExternalResource.getUrl(ExternalResource.HF_Public, '/sounds/Switches%20and%20sliders/flashlight_on.wav');
+    var ON_SOUND_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, '/sounds/Switches%20and%20sliders/flashlight_on.wav');
-    var OFF_SOUND_URL = ExternalResource.getUrl(ExternalResource.HF_Public, '/sounds/Switches%20and%20sliders/flashlight_off.wav');
+    var OFF_SOUND_URL = Script.getExternalPath(Script.ExternalPaths.HF_Public, '/sounds/Switches%20and%20sliders/flashlight_off.wav');
 
     //we are creating lights that we don't want to get stranded so lets make sure that we can get rid of them
     //if you're going to be using this in a dungeon or something and holding it for a long time, increase this lifetime value.

scripts/tutorials/entity_scripts/floatingLanternBox.js

@@ -16,7 +16,7 @@
 (function() {
 
     var _this;
-    var LANTERN_MODEL_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/DomainContent/Welcome%20Area/Models/chinaLantern_capsule.fbx");
+    var LANTERN_MODEL_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/DomainContent/Welcome%20Area/Models/chinaLantern_capsule.fbx");
     var LANTERN_SCRIPT_URL = Script.resolvePath("floatingLantern.js?v=" + Date.now());
     var LIFETIME = 120;
     var RESPAWN_INTERVAL = 1000;

scripts/tutorials/entity_scripts/sit.js

@@ -18,7 +18,7 @@
     }
 
     var SETTING_KEY = "com.highfidelity.avatar.isSitting";
-    var ANIMATION_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/clement/production/animations/sitting_idle.fbx");
+    var ANIMATION_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/clement/production/animations/sitting_idle.fbx");
     var ANIMATION_FPS = 30;
     var ANIMATION_FIRST_FRAME = 1;
     var ANIMATION_LAST_FRAME = 10;

scripts/tutorials/nBody.js

@@ -18,8 +18,8 @@ var bodies = [];
 var n = 3;  
 var radius = 0.1;
 var G = 0.25;
-var EARTH = ExternalResource.getUrl(ExternalResource.HF_Content, "/seth/production/NBody/earth.fbx");
+var EARTH = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/seth/production/NBody/earth.fbx");
-var MOON = ExternalResource.getUrl(ExternalResource.HF_Content, "/seth/production/NBody/moon.fbx");
+var MOON = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/seth/production/NBody/moon.fbx");
 
 var COLOR1 = { red: 51, green: 51, blue: 255 };
 var COLOR2 = { red: 51, green: 51, blue: 255 };

tools/nitpick/AppDataHighFidelity/Interface.json

@@ -38,7 +38,7 @@
     "Avatar/animGraphURL": "",
     "Avatar/attachmentData/size": 0,
     "Avatar/avatarEntityData/size": 0,
-    "Avatar/collisionSoundURL": "https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav",
+    "Avatar/collisionSoundURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/sounds/Collisions-otherorganic/Body_Hits_Impact.wav",
     "Avatar/displayName": "",
     "Avatar/dominantHand": "right",
     "Avatar/flyingHMD": false,

unpublishedScripts/DomainContent/Cupcake/eatable.js

@@ -10,7 +10,7 @@
 //
 
 (function () {
-    var NOMNOM_SOUND = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Content, "/DomainContent/production/audio/vegcrunch.wav"));
+    var NOMNOM_SOUND = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Content, "/DomainContent/production/audio/vegcrunch.wav"));
 
     var _entityID;
 

unpublishedScripts/DomainContent/Toybox/doll/doll.js

@@ -67,7 +67,7 @@
                     animation: {
                         // Providing actual model fbx for animation used to work, now contorts doll into a weird ball
                         // See bug:  https://app.asana.com/0/26225263936266/70097355490098
-                        // url: ExternalResource.getUrl(ExternalResource.HF_Public, '/models/Bboys/bboy2/bboy2.fbx"),
+                        // url: Script.getExternalPath(Script.ExternalPaths.HF_Public, '/models/Bboys/bboy2/bboy2.fbx"),
                         running: false,
                     }
                 });

unpublishedScripts/DomainContent/Toybox/flashlight/flashlight.js

@@ -8,7 +8,7 @@
 //  Copyright 2015 High Fidelity, Inc.
 //
 //  This is a toy script that can be added to the Flashlight model entity:
-//  ExternalResource.getUrl(ExternalResource.HF_Public, "/models/props/flashlight.fbx")
+//  Script.getExternalPath(Script.ExternalPaths.HF_Public, "/models/props/flashlight.fbx")
 //  that creates a spotlight attached with the flashlight model while the entity is grabbed
 //
 //  Distributed under the Apache License, Version 2.0.

unpublishedScripts/DomainContent/Toybox/pistol/pistol.js

@@ -266,7 +266,7 @@
                 "alphaStart": 0,
                 "alphaFinish": 0,
                 "additiveBlending": 0,
-                "textures": ExternalResource.getUrl(ExternalResource.HF_Public, "/alan/Particles/Particle-Sprite-Smoke-1.png")
+                "textures": Script.getExternalPath(Script.ExternalPaths.HF_Public, "/alan/Particles/Particle-Sprite-Smoke-1.png")
             });
             Script.setTimeout(function() {
                 Entities.editEntity(smoke, {

unpublishedScripts/marketplace/blocks/blocksApp.js

@@ -15,9 +15,9 @@
 (function () {
 	var APP_NAME = "BLOCKS";
 	var APP_URL = "https://poly.google.com/";
-	var APP_OUTDATED_URL = ExternalResource.getUrl(ExternalResource.HF_Content, "/elisalj/blocks/updateToBlocks.html");
+	var APP_OUTDATED_URL = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/elisalj/blocks/updateToBlocks.html");
-	var APP_ICON = ExternalResource.getUrl(ExternalResource.HF_Content, "/elisalj/blocks/blocks-i.svg");
+	var APP_ICON = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/elisalj/blocks/blocks-i.svg");
-	var APP_ICON_ACTIVE = ExternalResource.getUrl(ExternalResource.HF_Content, "/elisalj/blocks/blocks-a.svg");
+	var APP_ICON_ACTIVE = Script.getExternalPath(Script.ExternalPaths.HF_Content, "/elisalj/blocks/blocks-a.svg");
 
     try {
         print("Current Interface version: " + Window.checkVersion());

unpublishedScripts/marketplace/boppo/boppoClownEntity.js

@@ -40,7 +40,7 @@
         var BoppoClownEntity = function () {
             _this = this;
             PUNCH_SOUNDS.forEach(function(punch) {
-                _punchSounds.push(SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Content, '/caitlyn/production/elBoppo/sfx/' + punch)));
+                _punchSounds.push(SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Content, '/caitlyn/production/elBoppo/sfx/' + punch)));
             });
         };
 

unpublishedScripts/marketplace/boppo/boppoServer.js

@@ -167,12 +167,12 @@
             _boppoClownID = null;
             _coolDown = false;
             CLOWN_LAUGHS.forEach(function(clownLaugh) {
-                _clownLaughs.push(SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Content, + clownLaugh)));
+                _clownLaughs.push(SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Content, + clownLaugh)));
             });
-            _tickTockSound = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Content, TICK_TOCK_SOUND));
+            _tickTockSound = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Content, TICK_TOCK_SOUND));
-            _boxingBellRingStart = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Content, BOXING_RING_BELL_START));
+            _boxingBellRingStart = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Content, BOXING_RING_BELL_START));
-            _boxingBellRingEnd = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Content, BOXING_RING_BELL_END));
+            _boxingBellRingEnd = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Content, BOXING_RING_BELL_END));
-            _music = SoundCache.getSound(ExternalResource.getUrl(ExternalResource.HF_Content, BOPPO_MUSIC));
+            _music = SoundCache.getSound(Script.getExternalPath(Script.ExternalPaths.HF_Content, BOPPO_MUSIC));
             _boppoEntities = {};
         };
 
@@ -199,9 +199,9 @@
                 var boppoBaseProperties = Entities.getEntityProperties(_entityID, ['position', 'rotation']);
                 _boppoClownID = Entities.addEntity({
                     angularDamping: 0.0,
-                    collisionSoundURL: ExternalResource.getUrl(ExternalResource.HF_Content, 'caitlyn/production/elBoppo/51460__andre-rocha-nascimento__basket-ball-01-bounce.wav'),
+                    collisionSoundURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, 'caitlyn/production/elBoppo/51460__andre-rocha-nascimento__basket-ball-01-bounce.wav'),
                     collisionsWillMove: true,
-                    compoundShapeURL: ExternalResource.getUrl(ExternalResource.HF_Content, 'caitlyn/production/elBoppo/bopo_phys.obj'),
+                    compoundShapeURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, 'caitlyn/production/elBoppo/bopo_phys.obj'),
                     damping: 1.0,
                     density: 10000,
                     dimensions: {
@@ -216,7 +216,7 @@
                         y: -25,
                         z: 0
                     },
-                    modelURL: ExternalResource.getUrl(ExternalResource.HF_Content, 'caitlyn/production/elBoppo/elBoppo3_VR.fbx'),
+                    modelURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, 'caitlyn/production/elBoppo/elBoppo3_VR.fbx'),
                     name: 'El Boppo the Punching Bag Clown',
                     registrationPoint: {
                         x: 0.5,

unpublishedScripts/marketplace/boppo/clownGloveDispenser.js

@@ -35,7 +35,7 @@
                 y: -9.8,
                 z: 0
             },
-            modelURL: ExternalResource.getUrl(ExternalResource.HF_Content, "/caitlyn/production/elBoppo/LFT_glove_VR3.fbx"),
+            modelURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/caitlyn/production/elBoppo/LFT_glove_VR3.fbx"),
             name: "Boxing Glove - Left",
             registrationPoint: {
                 x: 0.5,
@@ -76,7 +76,7 @@
                 y: -9.8,
                 z: 0
             },
-            modelURL: ExternalResource.getUrl(ExternalResource.HF_Content, "/caitlyn/production/elBoppo/RT_glove_VR2.fbx"),
+            modelURL: Script.getExternalPath(Script.ExternalPaths.HF_Content, "/caitlyn/production/elBoppo/RT_glove_VR2.fbx"),
             name: "Boxing Glove - Right",
             registrationPoint: {
                 x: 0.5,