From e2bf8ad231d5afe23892b481cb8cf3ae35c4cb8f Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Fri, 2 Feb 2018 15:36:28 -0800
Subject: [PATCH] reverted to S3 for model URL

---
 interface/resources/qml/hifi/AssetServer.qml               | 2 +-
 interface/resources/qml/hifi/dialogs/TabletAssetServer.qml | 2 +-
 interface/src/Application.cpp                              | 2 +-
 scripts/system/edit.js                                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index f3c910d95c..b8cafdd6c5 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -183,7 +183,7 @@ Windows.ScrollingWindow {
 
         if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
             var name = assetProxyModel.data(treeView.selection.currentIndex);
-            var modelURL = "../../meshes/images/default-image-model.fbx";
+            var modelURL = "https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx";
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 37aa51464d..bf5ead30f6 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -184,7 +184,7 @@ Rectangle {
 
         if (defaultURL.endsWith(".jpg") || defaultURL.endsWith(".png")) {
             var name = assetProxyModel.data(treeView.selection.currentIndex);
-            var modelURL = "../../../meshes/images/default-image-model.fbx";
+            var modelURL = "https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx";
             var textures = JSON.stringify({ "tex.picture": defaultURL});
             var shapeType = "box";
             var dynamic = false;
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 53c1e3fad5..1d27973332 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6525,7 +6525,7 @@ void Application::addAssetToWorldAddEntity(QString filePath, QString mapping) {
         QJsonObject textures {
             {"tex.picture", QString("atp:" + mapping) }
         };
-        properties.setModelURL("qrc:///snapshot/snapshot.fbx");
+        properties.setModelURL("https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx");
         properties.setTextures(QJsonDocument(textures).toJson(QJsonDocument::Compact));
         properties.setShapeType(SHAPE_TYPE_BOX);
     } else {
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index aab47d4b91..91e6e85444 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -540,8 +540,8 @@ var toolBar = (function () {
         });
 
         addButton("newImageButton", "web-01.svg", function () {
-            var IMAGE_MODEL = Script.resourcesPath() + "meshes/images/default-image-model.fbx";
-            var DEFAULT_IMAGE = Script.resourcesPath() + "snapshot/img/no-image.jpg";
+            var IMAGE_MODEL = "https://hifi-content.s3.amazonaws.com/DomainContent/production/default-image-model.fbx";
+            var DEFAULT_IMAGE = "https://hifi-content.s3.amazonaws.com/DomainContent/production/no-image.jpg";
             createNewEntity({
                 type: "Model",
                 dimensions: {