Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 01:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4828 from howard-stearns/inline-entity-scripts

Browse source 
Inline entity scripts
This commit is contained in:
Brad Hefta-Gaub 2015-05-11 12:25:18 -07:00
commit 09d7df9ee2
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -142,7 +142,9 @@ QString EntityTreeRenderer::loadScriptContents(const QString& scriptMaybeURLorTe
QUrl url(scriptMaybeURLorText); QUrl url(scriptMaybeURLorText);
// If the url is not valid, this must be script text... // 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; isURL = false;
return scriptMaybeURLorText; return scriptMaybeURLorText;
} }