From 1c9e1dd1606f481aea31b4a3d70ff284e52bb19a Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 23 Sep 2020 00:14:31 -0400 Subject: [PATCH 1/5] Remove redundant buckets. --- libraries/networking/src/ExternalResource.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/networking/src/ExternalResource.h b/libraries/networking/src/ExternalResource.h index c2a08c02a5..c58e153c56 100644 --- a/libraries/networking/src/ExternalResource.h +++ b/libraries/networking/src/ExternalResource.h @@ -61,9 +61,7 @@ public: HF_Marketplace, /** Vircadia assets */ - Assets, - Public, - Content + Assets }; Q_ENUM(Bucket) @@ -155,9 +153,7 @@ private: { Bucket::HF_Public, QUrl(NetworkingConstants::HF_PUBLIC_CDN_URL) }, { Bucket::HF_Content, QUrl(NetworkingConstants::HF_CONTENT_CDN_URL) }, { Bucket::HF_Marketplace, QUrl(NetworkingConstants::HF_MPASSETS_CDN_URL) }, - { Bucket::Assets, QUrl(NetworkingConstants::VIRCADIA_CONTENT_CDN_URL) }, - { Bucket::Public, QUrl(NetworkingConstants::VIRCADIA_CONTENT_CDN_URL) }, - { Bucket::Content, QUrl(NetworkingConstants::VIRCADIA_CONTENT_CDN_URL) } + { Bucket::Assets, QUrl(NetworkingConstants::VIRCADIA_CONTENT_CDN_URL) } }; }; From ed5a7e82d722140f4667a0de5bb331b378958ff6 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 23 Sep 2020 01:57:00 -0400 Subject: [PATCH 2/5] Fix default URLs for edit.js --- scripts/system/create/edit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js index dc4a480ed8..b8f1dc8014 100644 --- a/scripts/system/create/edit.js +++ b/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 = Script.getExternalPath(Script.ExternalPaths.Assets, "interface/default/default_image.jpg"); -var DEFAULT_PARTICLE = Script.getExternalPath(Script.ExternalPaths.Assets, "interface/default/default_particle.png"); +var DEFAULT_IMAGE = Script.getExternalPath(Script.ExternalPaths.Assets, "Bazaar/Assets/Textures/Defaults/Interface/default_image.jpg"); +var DEFAULT_PARTICLE = Script.getExternalPath(Script.ExternalPaths.Assets, "Bazaar/Assets/Textures/Defaults/Interface/default_particle.png"); var createToolsWindow = new CreateWindow( Script.resolvePath("qml/EditTools.qml"), From ec15b51110ffa713907f58ded4f096fc7e3068db Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 23 Sep 2020 02:52:20 -0400 Subject: [PATCH 3/5] Fix typo. --- interface/resources/qml/hifi/avatarapp/AvatarsModel.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml index a9bfcb7bb7..2a322b3c2e 100644 --- a/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml +++ b/interface/resources/qml/hifi/avatarapp/AvatarsModel.qml @@ -50,9 +50,9 @@ ListModel { function makeAvatarObject(avatar, avatarName) { var avatarThumbnailUrl; - + if (!avatar.avatarIcon) { - makeThumbnailUrl(avatar.avatarUrl); + avatarThumbnailUrl = makeThumbnailUrl(avatar.avatarUrl); } else { avatarThumbnailUrl = avatar.avatarIcon; } From 560a1a71193c9085d8fd21d355d928a56ae54d6d Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 23 Sep 2020 03:29:03 -0400 Subject: [PATCH 4/5] Update sandbox URL. --- server-console/src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-console/src/main.js b/server-console/src/main.js index d8d6fea4bf..e83b37ac4c 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -56,7 +56,7 @@ const menuNotificationIcon = path.join(__dirname, '../resources/tray-menu-notifi const DELETE_LOG_FILES_OLDER_THAN_X_SECONDS = 60 * 60 * 24 * 7; // 7 Days const LOG_FILE_REGEX = /(domain-server|ac-monitor|ac)-.*-std(out|err).txt/; -const HOME_CONTENT_URL = "http://cdn.highfidelity.com/content-sets/home-tutorial-RC40.tar.gz"; +const HOME_CONTENT_URL = "http://cdn-1.vircadia.com/us-e-1/DomainContent/Sandbox/Rearranged_Basic_Sandbox.tar.gz"; const buildInfo = GetBuildInfo(); From 24d4076079f517b5a486547189f53eb43d8f1100 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 23 Sep 2020 03:56:50 -0400 Subject: [PATCH 5/5] Fix another URL. --- interface/resources/serverless/redirect.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/serverless/redirect.json b/interface/resources/serverless/redirect.json index efd5015c4d..70377eb506 100644 --- a/interface/resources/serverless/redirect.json +++ b/interface/resources/serverless/redirect.json @@ -296,7 +296,7 @@ "lastEdited": 1537901430334966, "lastEditedBy": "{69540019-db48-4375-86c8-ac1a4a90d043}", "locked": true, - "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-public/alexia/LoadingScreens/floor.fbx", + "modelURL": "https://cdn-1.vircadia.com/eu-c-1/vircadia-content/alexia/LoadingScreens/floor.fbx", "name": "floorModel", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "position": {