From d2335ea9f6e3675e28ba86b7e3957fc2c72664ac Mon Sep 17 00:00:00 2001 From: Liv Erickson Date: Wed, 18 Apr 2018 13:18:50 -0700 Subject: [PATCH] fix in where octree imports url so fix is global --- libraries/octree/src/Octree.cpp | 2 +- scripts/system/edit.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index dafdfd5bf4..8191049971 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -1669,7 +1669,7 @@ QString getMarketplaceID(const QString& urlString) { bool Octree::readFromURL(const QString& urlString) { QString marketplaceID = getMarketplaceID(urlString); auto request = - std::unique_ptr(DependencyManager::get()->createResourceRequest(this, urlString)); + std::unique_ptr(DependencyManager::get()->createResourceRequest(this, urlString.trimmed())); if (!request) { return false; diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 9d50a42795..467842c712 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -1679,7 +1679,7 @@ function importSVO(importURL) { visible: true }); - var success = Clipboard.importEntities(importURL.trim()); + var success = Clipboard.importEntities(importURL); if (success) { var VERY_LARGE = 10000;