Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:18:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix in where octree imports url so fix is global

Browse source
This commit is contained in:
Liv Erickson 2018-04-18 13:18:50 -07:00
parent 958d057422
commit d2335ea9f6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/octree/src/Octree.cpp
View file

@ -1669,7 +1669,7 @@ QString getMarketplaceID(const QString& urlString) {
bool Octree::readFromURL(const QString& urlString) { bool Octree::readFromURL(const QString& urlString) {
QString marketplaceID = getMarketplaceID(urlString); QString marketplaceID = getMarketplaceID(urlString);
auto request = auto request =
std::unique_ptr<ResourceRequest>(DependencyManager::get<ResourceManager>()->createResourceRequest(this, urlString)); std::unique_ptr<ResourceRequest>(DependencyManager::get<ResourceManager>()->createResourceRequest(this, urlString.trimmed()));
if (!request) { if (!request) {
return false; return false;

2
scripts/system/edit.js
View file

@ -1679,7 +1679,7 @@ function importSVO(importURL) {
visible: true visible: true
}); });
var success = Clipboard.importEntities(importURL.trim()); var success = Clipboard.importEntities(importURL);
if (success) { if (success) {
var VERY_LARGE = 10000; var VERY_LARGE = 10000;