Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 3 files). Show all
Unified · Split
| @@ -2333,7 +2333,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 2332 unmodified lines | |||
| 2333 | if (isURL) { | 2333 | if (isURL) { |
| 2334 | setParentURL(scriptOrURL); | 2334 | setParentURL(scriptOrURL); |
| 2335 | } | 2335 | } |
| 2336 | 2336 | ||
| 2337 | // SANITY/PERFORMANCE CHECK USING SANDBOX | 2337 | // SANITY/PERFORMANCE CHECK USING SANDBOX |
| 2338 | const int SANDBOX_TIMEOUT = 0.25 * MSECS_PER_SECOND; | 2338 | const int SANDBOX_TIMEOUT = 0.25 * MSECS_PER_SECOND; |
| 2339 | BaseScriptEngine sandbox; | 2339 | BaseScriptEngine sandbox; |
| @@ -2370,8 +2370,8 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co · 30 unmodified lines | |||
| 2370 | safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts); | 2370 | safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts); |
| 2371 | 2371 | ||
| 2372 | // ENTITY SCRIPT WHITELIST TOGGLE CHECK | 2372 | // ENTITY SCRIPT WHITELIST TOGGLE CHECK |
| 2373 | Setting::Handle<bool> _whitelistEnabled{"private/whitelistEnabled", false }; | 2373 | Setting::Handle<bool> whitelistEnabled{"private/whitelistEnabled", false }; |
| 2374 | bool whitelistEnabled = _whitelistEnabled.get(); | 2374 | bool whitelistEnabled = whitelistEnabled.get(); |
| 2375 | 2375 | ||
| 2376 | if (!whitelistEnabled) { | 2376 | if (!whitelistEnabled) { |
| 2377 | qCDebug(scriptengine) << "Whitelist Enabled: " << whitelistEnabled; | 2377 | qCDebug(scriptengine) << "Whitelist Enabled: " << whitelistEnabled; |