From 63595e196e17e74fa084949636a56ff4dff532ef Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Thu, 31 Mar 2016 14:02:47 -0700
Subject: [PATCH] fix batch-loaded local scripts
---
libraries/script-engine/src/ScriptEngine.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index c7a3396078..95ca4ab4f8 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -847,7 +847,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
QUrl url(include);
// first lets check to see if it's already a full URL
if (!url.scheme().isEmpty()) {
- return url;
+ return expandScriptUrl(normalizeScriptURL(url));
}
// we apparently weren't a fully qualified url, so, let's assume we're relative
@@ -864,7 +864,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
}
// at this point we should have a legitimate fully qualified URL for our parent
- url = parentURL.resolved(url);
+ url = expandScriptUrl(normalizeScriptURL(parentURL.resolved(url)));
return url;
}