ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-02 08:25:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Make all coded defaults match settings in OpenSim.ini.example

Browse Source 
* 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)
This commit is contained in:
Justin Clarke Casey
2009-03-11 18:02:22 +00:00
parent 5a6e502266
commit acad0328b2
17 changed files with 133 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
View File

@@ -112,10 +112,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
/// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY.
/// </summary>
public static long maxFunctionExecutionTimens;
/// <summary>
/// Enforce max execution time
/// </summary>
public static bool EnforceMaxExecutionTime;
/// <summary>
/// Kill script (unload) when it exceeds execution time
/// </summary>
@@ -163,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
// Refresh config
numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2);
maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000);
EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", false);
EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", true);
KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false);
EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300);

2
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
View File

@@ -171,7 +171,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
public void ReadConfig()
{
RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30);
RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0);
if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig();
if (m_EventManager != null) m_EventManager.ReadConfig();

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -8717,7 +8717,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IConfigSource config = new IniConfigSource(Application.iniFilePath);
if (config.Configs["Network"] != null)
{
shard = config.Configs["Network"].GetString("user_server_url", shard);
shard
= config.Configs["Network"].GetString(
"user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
shard = config.Configs["Network"].GetString("shard", shard);
}

3
OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
View File

@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
public void ReadConfig()
{
// Get some config
WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true);
WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", false);
CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true);
// Get file prefix from scriptengine name and make it file system safe:
@@ -187,7 +187,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
/// </summary>
private void DeleteOldFiles()
{
// CREATE FOLDER IF IT DOESNT EXIST
if (!Directory.Exists(ScriptEnginesPath))
{