From b57d9be856ba53a3014a2fac475de35cf730d0f6 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Sat, 2 Feb 2008 05:07:02 +0000 Subject: Re-enabled AllowedCompilers function Added notice in OpenSim.ini that config refresh function is disabled --- .../DotNetEngine/Compiler/LSL/Compiler.cs | 2 +- bin/OpenSim.32BitLaunch.exe | Bin 4608 -> 4608 bytes bin/OpenSim.32BitLaunch.pdb | Bin 11776 -> 11776 bytes bin/OpenSim.ini.example | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index ded0fcc..2622cb9 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs @@ -247,7 +247,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // Not allowed to compile to this language! string errtext = String.Empty; errtext += "The compiler for language \"" + l.ToString() + "\" is not in list of allowed compilers. Script will not be executed!"; - //throw new Exception(errtext); + throw new Exception(errtext); } string compileScript = Script; diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe index 64bef64..a3a00e8 100644 Binary files a/bin/OpenSim.32BitLaunch.exe and b/bin/OpenSim.32BitLaunch.exe differ diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb index f444e0d..069afee 100644 Binary files a/bin/OpenSim.32BitLaunch.pdb and b/bin/OpenSim.32BitLaunch.pdb differ diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 7b2198b..49c93d3 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -145,6 +145,7 @@ script_engine = OpenSim.Region.ScriptEngine.DotNetEngine.dll ; Set it to number of seconds between refresh, for example 30. ; Will allow you to change ScriptEngine settings while server is running just by editing this file. ; For example to increase or decrease number of threads. +; NOTE! Disabled for now. Feature does not work. RefreshConfig=0 ; Number of threads to use for script event execution -- cgit v1.1