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

non-working state

Browse source
This commit is contained in:
Kasen IO 2020-01-21 22:51:30 -05:00
parent bd066adbf6
commit 61943d0edb
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -2370,18 +2370,8 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
safeURLPrefixes += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts);
// ENTITY SCRIPT WHITELIST TOGGLE CHECK
Setting::Handle<bool> whitelistEnabledSetting{"private/whitelistEnabled", true}; // Assume it is enabled.
bool whitelistEnabled = whitelistEnabledSetting.get();
// QVariant whitelistEnabledExists = Setting::Handle<QVariant>("private/whitelistEnabled", false).get();
if (whitelistEnabled) {
whitelistEnabledSetting.set(true);
qCDebug(scriptengine) << "Whitelist toggle setting does not exist. Creating setting now.";
} else {
qCDebug(scriptengine) << "Whitelist toggle setting does not exist. Creating setting now.";
whitelistEnabledSetting.set(false);
}
if (!whitelistEnabled) {
passList = true;
}

2
libraries/script-engine/src/ScriptEngine.h
View file

@ -973,6 +973,8 @@ protected:
Setting::Handle<bool> _enableExtendedJSExceptions { _SETTINGS_ENABLE_EXTENDED_EXCEPTIONS, true };
Setting::Handle<bool> whitelistEnabledSetting { "DELME/whitelistEnabled", false }; // Set to false if not exist.
QWeakPointer<ScriptEngines> _scriptEngines;
};