History

Merge pull request #11390 from elisa-lj11/master

Fixed blocks download issue with `noDownload=false` tag

Elisa Lupin-Jimenez committed 9 years ago

Commit a41aced2 parents 79d97dc a45cc881 file · +11 −2Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+11−2
@@ -6430,7 +6430,12 @@ void Application::addAssetToWorldFromURL(QString url) { · 6429 unmodified lines
64306430 }
64316431 if (url.contains("vr.google.com/downloads")) {
64326432 filename = url.section('/', -1);
6433− filename.remove(".zip");
6433+ if (url.contains("noDownload")) {
6434+ filename.remove(".zip?noDownload=false");
6435+ } else {
6436+ filename.remove(".zip");
6437+ }
6438+
64346439 }
64356440
64366441 if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
@@ -6460,7 +6465,11 @@ void Application::addAssetToWorldFromURLRequestFinished() { · 23 unmodified lines
64606465 }
64616466 if (url.contains("vr.google.com/downloads")) {
64626467 filename = url.section('/', -1);
6463− filename.remove(".zip");
6468+ if (url.contains("noDownload")) {
6469+ filename.remove(".zip?noDownload=false");
6470+ } else {
6471+ filename.remove(".zip");
6472+ }
64646473 isBlocks = true;
64656474 }
64666475