aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-02-02 05:07:02 +0000
committerTedd Hansen2008-02-02 05:07:02 +0000
commitb57d9be856ba53a3014a2fac475de35cf730d0f6 (patch)
tree680900b9da2f4d1379a175f3707578b898680998
parentAlmost forgot to check in: (diff)
downloadopensim-SC_OLD-b57d9be856ba53a3014a2fac475de35cf730d0f6.zip
opensim-SC_OLD-b57d9be856ba53a3014a2fac475de35cf730d0f6.tar.gz
opensim-SC_OLD-b57d9be856ba53a3014a2fac475de35cf730d0f6.tar.bz2
opensim-SC_OLD-b57d9be856ba53a3014a2fac475de35cf730d0f6.tar.xz
Re-enabled AllowedCompilers function
Added notice in OpenSim.ini that config refresh function is disabled
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs2
-rw-r--r--bin/OpenSim.32BitLaunch.exebin4608 -> 4608 bytes
-rw-r--r--bin/OpenSim.32BitLaunch.pdbbin11776 -> 11776 bytes
-rw-r--r--bin/OpenSim.ini.example1
4 files changed, 2 insertions, 1 deletions
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
247 // Not allowed to compile to this language! 247 // Not allowed to compile to this language!
248 string errtext = String.Empty; 248 string errtext = String.Empty;
249 errtext += "The compiler for language \"" + l.ToString() + "\" is not in list of allowed compilers. Script will not be executed!"; 249 errtext += "The compiler for language \"" + l.ToString() + "\" is not in list of allowed compilers. Script will not be executed!";
250 //throw new Exception(errtext); 250 throw new Exception(errtext);
251 } 251 }
252 252
253 string compileScript = Script; 253 string compileScript = Script;
diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
index 64bef64..a3a00e8 100644
--- a/bin/OpenSim.32BitLaunch.exe
+++ b/bin/OpenSim.32BitLaunch.exe
Binary files differ
diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb
index f444e0d..069afee 100644
--- a/bin/OpenSim.32BitLaunch.pdb
+++ b/bin/OpenSim.32BitLaunch.pdb
Binary files 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
145; Set it to number of seconds between refresh, for example 30. 145; Set it to number of seconds between refresh, for example 30.
146; Will allow you to change ScriptEngine settings while server is running just by editing this file. 146; Will allow you to change ScriptEngine settings while server is running just by editing this file.
147; For example to increase or decrease number of threads. 147; For example to increase or decrease number of threads.
148; NOTE! Disabled for now. Feature does not work.
148RefreshConfig=0 149RefreshConfig=0
149 150
150; Number of threads to use for script event execution 151; Number of threads to use for script event execution