diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a10ca3d..40889ca 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7978,11 +7978,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7978 | public void llSetObjectPermMask(int mask, int value) | 7978 | public void llSetObjectPermMask(int mask, int value) |
7979 | { | 7979 | { |
7980 | m_host.AddScriptLPS(1); | 7980 | m_host.AddScriptLPS(1); |
7981 | IConfigSource config = new IniConfigSource(Application.iniFilePath); | ||
7982 | if (config.Configs["XEngine"] == null) | ||
7983 | config.AddConfig("XEngine"); | ||
7984 | 7981 | ||
7985 | if (config.Configs["XEngine"].GetBoolean("AllowGodFunctions", false)) | 7982 | if (m_ScriptEngine.Config.GetBoolean("AllowGodFunctions", false)) |
7986 | { | 7983 | { |
7987 | if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID)) | 7984 | if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID)) |
7988 | { | 7985 | { |
@@ -8990,7 +8987,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8990 | Dictionary<string, string> httpHeaders = new Dictionary<string, string>(); | 8987 | Dictionary<string, string> httpHeaders = new Dictionary<string, string>(); |
8991 | 8988 | ||
8992 | string shard = "OpenSim"; | 8989 | string shard = "OpenSim"; |
8993 | IConfigSource config = new IniConfigSource(Application.iniFilePath); | 8990 | IConfigSource config = m_ScriptEngine.ConfigSource; |
8994 | if (config.Configs["Network"] != null) | 8991 | if (config.Configs["Network"] != null) |
8995 | { | 8992 | { |
8996 | shard | 8993 | shard |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 5090e89..2457b3a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -950,6 +950,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
950 | "Line ({0}): {1}", scriptLine - 1, | 950 | "Line ({0}): {1}", scriptLine - 1, |
951 | e.InnerException.Message); | 951 | e.InnerException.Message); |
952 | 952 | ||
953 | System.Console.WriteLine(e.ToString()+"\n"); | ||
953 | return message; | 954 | return message; |
954 | } | 955 | } |
955 | } | 956 | } |