From 3884287c416d9f8e5c62af2b40e1e96d2bc589ad Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 7 Jun 2017 15:11:53 -0700 Subject: [PATCH] Use 'resource' protocol instead of 'http' --- .../model-networking/src/model-networking/TextureCache.cpp | 2 +- scripts/system/spectatorCamera.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp index f8b48833f7..69eede0cc2 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.cpp +++ b/libraries/model-networking/src/model-networking/TextureCache.cpp @@ -50,7 +50,7 @@ Q_LOGGING_CATEGORY(trace_resource_parse_image_ktx, "trace.resource.parse.image.k const std::string TextureCache::KTX_DIRNAME { "ktx_cache" }; const std::string TextureCache::KTX_EXT { "ktx" }; -const std::string TextureCache::SPECTATOR_CAMERA_FRAME_URL { "http://spectatorCameraFrame" }; +const std::string TextureCache::SPECTATOR_CAMERA_FRAME_URL { "resource://spectatorCameraFrame" }; static const float SKYBOX_LOAD_PRIORITY { 10.0f }; // Make sure skybox loads first static const float HIGH_MIPS_LOAD_PRIORITY { 9.0f }; // Make sure high mips loads after skybox but before models diff --git a/scripts/system/spectatorCamera.js b/scripts/system/spectatorCamera.js index 9df7dade53..051741d55f 100644 --- a/scripts/system/spectatorCamera.js +++ b/scripts/system/spectatorCamera.js @@ -105,7 +105,7 @@ }, true); // Put an image3d overlay on the near face, as a viewFinder. viewFinderOverlay = Overlays.addOverlay("image3d", { - url: "http://spectatorCameraFrame", + url: "resource://spectatorCameraFrame", parentID: camera, alpha: 1, position: inFrontOf(-0.25, cameraPosition, cameraRotation),