From f74c33f597d85f80c9aedbde5f50d281a69d649b Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 18 Oct 2017 17:44:36 +1300 Subject: [PATCH 1/2] Fix importing entities from URL --- scripts/system/edit.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/system/edit.js b/scripts/system/edit.js index d6d4de2a4b..332c9ed6c3 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -1476,10 +1476,19 @@ function onFileSaveChanged(filename) { function onFileOpenChanged(filename) { // disconnect the event, otherwise the requests will stack up - Window.openFileChanged.disconnect(onFileOpenChanged); + try { + // Not all calls to onFileOpenChanged() connect an event. + Window.openFileChanged.disconnect(onFileOpenChanged) + } catch (e) { + // Ignore. + } + var importURL = null; if (filename !== "") { - importURL = "file:///" + filename; + importURL = filename; + if (!/^(http|https):\/\//.test(filename)) { + importURL = "file:///" + importURL; + } } if (importURL) { if (!isActive && (Entities.canRez() && Entities.canRezTmp())) { From 5b6d33bcb23fc530006e5af7af04dcd4a7545254 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 18 Oct 2017 20:29:34 +1300 Subject: [PATCH 2/2] Missing semicolon --- scripts/system/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 332c9ed6c3..39ab946aa3 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -1478,7 +1478,7 @@ function onFileOpenChanged(filename) { // disconnect the event, otherwise the requests will stack up try { // Not all calls to onFileOpenChanged() connect an event. - Window.openFileChanged.disconnect(onFileOpenChanged) + Window.openFileChanged.disconnect(onFileOpenChanged); } catch (e) { // Ignore. }