From a45cc88e555630177f3995c4dd98dd912497be45 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa.lj11@gmail.com>
Date: Mon, 18 Sep 2017 11:41:30 -0700
Subject: [PATCH] Fixed blocks download issue with `noDownload=false` tag

---
 interface/src/Application.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8a2cd5b4c5..bd870ff8bb 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6411,7 +6411,12 @@ void Application::addAssetToWorldFromURL(QString url) {
     }
     if (url.contains("vr.google.com/downloads")) {
         filename = url.section('/', -1);
-        filename.remove(".zip");
+        if (url.contains("noDownload")) {
+            filename.remove(".zip?noDownload=false");
+        } else {
+            filename.remove(".zip");
+        }
+        
     }
 
     if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
@@ -6441,7 +6446,11 @@ void Application::addAssetToWorldFromURLRequestFinished() {
     }
     if (url.contains("vr.google.com/downloads")) {
         filename = url.section('/', -1);
-        filename.remove(".zip");
+        if (url.contains("noDownload")) {
+            filename.remove(".zip?noDownload=false");
+        } else {
+            filename.remove(".zip");
+        }
         isBlocks = true;
     }