aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-11 18:02:22 +0000
committerJustin Clarke Casey2009-03-11 18:02:22 +0000
commitacad0328b2c50d22fe76ebb7c8de2c97c856b42f (patch)
tree2379c1ae60c22a4dcee162c5b56d21f367c05bfd /OpenSim/Region/ScriptEngine
parent* Fix silly windows prebuild borkage. To use System.Xml, the project must ha... (diff)
downloadopensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.zip
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.gz
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.bz2
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.xz
* Make all coded defaults match settings in OpenSim.ini.example
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using * OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs3
4 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 2ebc8b7..bb79da4 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -112,10 +112,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
112 /// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY. 112 /// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY.
113 /// </summary> 113 /// </summary>
114 public static long maxFunctionExecutionTimens; 114 public static long maxFunctionExecutionTimens;
115
115 /// <summary> 116 /// <summary>
116 /// Enforce max execution time 117 /// Enforce max execution time
117 /// </summary> 118 /// </summary>
118 public static bool EnforceMaxExecutionTime; 119 public static bool EnforceMaxExecutionTime;
120
119 /// <summary> 121 /// <summary>
120 /// Kill script (unload) when it exceeds execution time 122 /// Kill script (unload) when it exceeds execution time
121 /// </summary> 123 /// </summary>
@@ -163,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
163 // Refresh config 165 // Refresh config
164 numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2); 166 numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2);
165 maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000); 167 maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000);
166 EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", false); 168 EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", true);
167 KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false); 169 KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false);
168 EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300); 170 EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300);
169 171
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index bdf80c6..c2b07fc 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
171 171
172 public void ReadConfig() 172 public void ReadConfig()
173 { 173 {
174 RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30); 174 RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0);
175 175
176 if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig(); 176 if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig();
177 if (m_EventManager != null) m_EventManager.ReadConfig(); 177 if (m_EventManager != null) m_EventManager.ReadConfig();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 69d9c38..1ede395 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8717,7 +8717,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8717 IConfigSource config = new IniConfigSource(Application.iniFilePath); 8717 IConfigSource config = new IniConfigSource(Application.iniFilePath);
8718 if (config.Configs["Network"] != null) 8718 if (config.Configs["Network"] != null)
8719 { 8719 {
8720 shard = config.Configs["Network"].GetString("user_server_url", shard); 8720 shard
8721 = config.Configs["Network"].GetString(
8722 "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
8721 shard = config.Configs["Network"].GetString("shard", shard); 8723 shard = config.Configs["Network"].GetString("shard", shard);
8722 } 8724 }
8723 8725
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 041e751..6c8f3d0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
100 public void ReadConfig() 100 public void ReadConfig()
101 { 101 {
102 // Get some config 102 // Get some config
103 WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true); 103 WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", false);
104 CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true); 104 CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true);
105 105
106 // Get file prefix from scriptengine name and make it file system safe: 106 // Get file prefix from scriptengine name and make it file system safe:
@@ -187,7 +187,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
187 /// </summary> 187 /// </summary>
188 private void DeleteOldFiles() 188 private void DeleteOldFiles()
189 { 189 {
190
191 // CREATE FOLDER IF IT DOESNT EXIST 190 // CREATE FOLDER IF IT DOESNT EXIST
192 if (!Directory.Exists(ScriptEnginesPath)) 191 if (!Directory.Exists(ScriptEnginesPath))
193 { 192 {