aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTedd Hansen2008-02-03 09:35:50 +0000
committerTedd Hansen2008-02-03 09:35:50 +0000
commit5a99a96fed11fafb1db00458a03970b3636eecd1 (patch)
tree1b70c74aae3f906b7deeb3962c66841e3711e91a /OpenSim/Region
parent* Updated the readme of PhysicsCamperBot to have documentation regarding a fe... (diff)
downloadopensim-SC_OLD-5a99a96fed11fafb1db00458a03970b3636eecd1.zip
opensim-SC_OLD-5a99a96fed11fafb1db00458a03970b3636eecd1.tar.gz
opensim-SC_OLD-5a99a96fed11fafb1db00458a03970b3636eecd1.tar.bz2
opensim-SC_OLD-5a99a96fed11fafb1db00458a03970b3636eecd1.tar.xz
Temporarily disabled shared threads because of a bug. Script were only working on 1 region. :)
Using default warning level on C#/VB compile
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs2
3 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index 7da2769..e1b1b6c 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -175,7 +175,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
175 { 175 {
176 m_ScriptEngine = _ScriptEngine; 176 m_ScriptEngine = _ScriptEngine;
177 177
178 bool PrivateRegionThreads = m_ScriptEngine.ScriptConfigSource.GetBoolean("PrivateRegionThreads", false); 178 // TODO: We need to move from single EventQueueManager to list of it in to share threads
179 bool PrivateRegionThreads = true; // m_ScriptEngine.ScriptConfigSource.GetBoolean("PrivateRegionThreads", false);
179 180
180 // Create thread pool list and lock object 181 // Create thread pool list and lock object
181 // Determine from config if threads should be dedicated to regions or shared 182 // Determine from config if threads should be dedicated to regions or shared
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index e346f68..6661fcc 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -100,7 +100,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
100 public void ReadConfig() 100 public void ReadConfig()
101 { 101 {
102 scriptLoadUnloadThread_IdleSleepms = m_scriptEngine.ScriptConfigSource.GetInt("ScriptLoadUnloadLoopms", 30); 102 scriptLoadUnloadThread_IdleSleepms = m_scriptEngine.ScriptConfigSource.GetInt("ScriptLoadUnloadLoopms", 30);
103 PrivateThread = m_scriptEngine.ScriptConfigSource.GetBoolean("PrivateScriptLoadUnloadThread", false); 103 // TODO: Requires sharing of all ScriptManagers to single thread
104 PrivateThread = true; // m_scriptEngine.ScriptConfigSource.GetBoolean("PrivateScriptLoadUnloadThread", false);
104 LoadUnloadMaxQueueSize = m_scriptEngine.ScriptConfigSource.GetInt("LoadUnloadMaxQueueSize", 100); 105 LoadUnloadMaxQueueSize = m_scriptEngine.ScriptConfigSource.GetInt("LoadUnloadMaxQueueSize", 100);
105 } 106 }
106 107
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 2622cb9..c994fea 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -349,7 +349,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
349 parameters.GenerateExecutable = false; 349 parameters.GenerateExecutable = false;
350 parameters.OutputAssembly = OutFile; 350 parameters.OutputAssembly = OutFile;
351 parameters.IncludeDebugInformation = CompileWithDebugInformation; 351 parameters.IncludeDebugInformation = CompileWithDebugInformation;
352 parameters.WarningLevel = 1; // Should be 4? 352 //parameters.WarningLevel = 1; // Should be 4?
353 parameters.TreatWarningsAsErrors = false; 353 parameters.TreatWarningsAsErrors = false;
354 354
355 CompilerResults results; 355 CompilerResults results;