From 51a29bdba60828cf0d44fec50cdd3b169f7ec92c Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Mon, 11 May 2015 11:52:41 -0700 Subject: [PATCH] Put back the script-fix that belongs in this branch. --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 943a3824c3..50477356cb 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -142,7 +142,9 @@ QString EntityTreeRenderer::loadScriptContents(const QString& scriptMaybeURLorTe QUrl url(scriptMaybeURLorText); // If the url is not valid, this must be script text... - if (!url.isValid()) { + // We document "direct injection" scripts as starting with "(function...", and that would never be a valid url. + // But QUrl thinks it is. + if (!url.isValid() || scriptMaybeURLorText.startsWith("(")) { isURL = false; return scriptMaybeURLorText; }