diff options
author | Charles Krinke | 2008-07-01 21:57:36 +0000 |
---|---|---|
committer | Charles Krinke | 2008-07-01 21:57:36 +0000 |
commit | e4d68a8b64abb5a6d7700392c8ead7fd5073aca9 (patch) | |
tree | 6ddb8d2b7471f9a92660bf381ea33e53af1f41d3 | |
parent | merge rotational and angular velocity (diff) | |
download | opensim-SC-e4d68a8b64abb5a6d7700392c8ead7fd5073aca9.zip opensim-SC-e4d68a8b64abb5a6d7700392c8ead7fd5073aca9.tar.gz opensim-SC-e4d68a8b64abb5a6d7700392c8ead7fd5073aca9.tar.bz2 opensim-SC-e4d68a8b64abb5a6d7700392c8ead7fd5073aca9.tar.xz |
Mantis#1643. Thank you Melanie for a patch that:
In the new runtime, there is a flag to diable all os* comamnds.
The implementation of osGetScriptEngineName ignored it.
This patch fixes this.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 5414b95..3e1c930 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -552,6 +552,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
552 | 552 | ||
553 | public string osGetScriptEngineName() | 553 | public string osGetScriptEngineName() |
554 | { | 554 | { |
555 | if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) | ||
556 | { | ||
557 | OSSLError("osGetScriptEngineName: permission denied"); | ||
558 | return ""; | ||
559 | } | ||
560 | |||
555 | m_host.AddScriptLPS(1); | 561 | m_host.AddScriptLPS(1); |
556 | 562 | ||
557 | int scriptEngineNameIndex = 0; | 563 | int scriptEngineNameIndex = 0; |