From a54f4eca93511de032da628c30ff1815e39d8062 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Mon, 20 Nov 2017 14:02:46 -0800
Subject: [PATCH] simplified naming of zip folders

---
 interface/src/Application.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index fb54983d39..41353208f7 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6336,12 +6336,7 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo
     QString mapping;
     QString filename = filenameFromPath(path);
     if (isZip || isBlocks) {
-        QString assetName;
-        if (isZip) {
-            assetName = zipFile.section("/", -1).remove(".zip");
-        } else if (isBlocks) {
-            assetName = zipFile.section("/", -1).remove(".zip?noDownload=false");
-        }
+        QString assetName = zipFile.section("/", -1).remove(QRegExp("\.zip(.*)$"));
         QString assetFolder = path.section("model_repo/", -1);
         mapping = "/" + assetName + "/" + assetFolder;
     } else {