Fixed blocks download issue with `noDownload=false` tag
Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -6430,7 +6430,12 @@ void Application::addAssetToWorldFromURL(QString url) { · 6429 unmodified lines | |||
| 6430 | } | 6430 | } |
| 6431 | if (url.contains("vr.google.com/downloads")) { | 6431 | if (url.contains("vr.google.com/downloads")) { |
| 6432 | filename = url.section('/', -1); | 6432 | 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 | |||
| 6434 | } | 6439 | } |
| 6435 | 6440 | ||
| 6436 | if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) { | 6441 | if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) { |
| @@ -6460,7 +6465,11 @@ void Application::addAssetToWorldFromURLRequestFinished() { · 23 unmodified lines | |||
| 6460 | } | 6465 | } |
| 6461 | if (url.contains("vr.google.com/downloads")) { | 6466 | if (url.contains("vr.google.com/downloads")) { |
| 6462 | filename = url.section('/', -1); | 6467 | 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 | } | ||
| 6464 | isBlocks = true; | 6473 | isBlocks = true; |
| 6465 | } | 6474 | } |
| 6466 | 6475 | ||