Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 21:30:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/fix/URL-migrations' into fix/external-resource

Browse source 
# Conflicts:
#	libraries/networking/src/ExternalResource.h
This commit is contained in:
David Rowe 2020-09-23 23:25:42 +12:00
commit 32b7823a73
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/avatarapp/AvatarsModel.qml
View file

@ -50,9 +50,9 @@ ListModel {
function makeAvatarObject(avatar, avatarName) { function makeAvatarObject(avatar, avatarName) {
var avatarThumbnailUrl; var avatarThumbnailUrl;
if (!avatar.avatarIcon) { if (!avatar.avatarIcon) {
makeThumbnailUrl(avatar.avatarUrl); avatarThumbnailUrl = makeThumbnailUrl(avatar.avatarUrl);
} else { } else {
avatarThumbnailUrl = avatar.avatarIcon; avatarThumbnailUrl = avatar.avatarIcon;
} }

2
interface/resources/serverless/redirect.json
View file

@ -296,7 +296,7 @@
"lastEdited": 1537901430334966, "lastEdited": 1537901430334966,
"lastEditedBy": "{69540019-db48-4375-86c8-ac1a4a90d043}", "lastEditedBy": "{69540019-db48-4375-86c8-ac1a4a90d043}",
"locked": true, "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", "name": "floorModel",
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}", "owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"position": { "position": {

4
scripts/system/create/edit.js
View file

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

2
server-console/src/main.js
View file

@ -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 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 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(); const buildInfo = GetBuildInfo();