diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 1462922a03..8aeca31493 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -87,14 +87,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_localID = localID; m_itemID = itemID; - IConfigSource config = new IniConfigSource(Application.iniFilePath); - if (config.Configs["XEngine"] == null) - config.AddConfig("XEngine"); - - m_ScriptDelayFactor = config.Configs["XEngine"]. - GetFloat("ScriptDelayFactor", 1.0f); - m_ScriptDistanceFactor = config.Configs["XEngine"]. - GetFloat("ScriptDistanceLimitFactor", 1.0f); + m_ScriptDelayFactor = + m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); + m_ScriptDistanceFactor = + m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); AsyncCommands = new AsyncCommandManager(ScriptEngine); } diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 8a5bdd7315..09f346206e 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -168,8 +168,6 @@ userDatabase_plugin = "OpenSim.Data.SQLite.dll" ; User Source MySQL example ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" -default_location_x = 1000 -default_location_y = 1000 dump_assets_to_file = false @@ -177,6 +175,10 @@ dump_assets_to_file = false http_listener_port = 9000 remoting_listener_port = 8895 + +default_location_x = 1000 +default_location_y = 1000 + ; ssl config: Experimental! The auto https config only really works definately on windows XP now ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below ; you can use https on other platforms, but you'll need to configure the httpapi yourself for now @@ -494,6 +496,11 @@ asterisk_salt = paluempalum [ScriptEngine.DotNetEngine] Enabled = true + +ScriptDelayFactor = 1.0 +ScriptDistanceLimitFactor = 1.0 + + ; ; These settings are specific to DotNetEngine script engine ; Other script engines based on OpenSim.Region.ScriptEngine.Common.dll will have almost identical settings, but in another section of this config file. @@ -609,9 +616,6 @@ AllowosConsoleCommand=false AllowGodFunctions = false -ScriptDelayFactor = 1.0 -ScriptDistanceLimitFactor = 1.0 - ; Maximum number of llListen events we allow per script ; Set this to 0 to have no limit imposed. max_listens_per_script = 64