OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Thank you kindly, Ewe Loon for a patch that solves: 

m_ScriptDelayFactor and m_ScriptDistanceFactor are 
being read from XEngine settings not the settings 
for the scriptengine being used
0.6.0-stable
Charles Krinke 2008-10-26 17:01:15 +00:00
parent c25f3ced04
commit 2462108bfb
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,14 +87,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_localID = localID; m_localID = localID;
m_itemID = itemID; m_itemID = itemID;
IConfigSource config = new IniConfigSource(Application.iniFilePath); m_ScriptDelayFactor =
if (config.Configs["XEngine"] == null) m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
config.AddConfig("XEngine"); m_ScriptDistanceFactor =
m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f);
m_ScriptDelayFactor = config.Configs["XEngine"].
GetFloat("ScriptDelayFactor", 1.0f);
m_ScriptDistanceFactor = config.Configs["XEngine"].
GetFloat("ScriptDistanceLimitFactor", 1.0f);
AsyncCommands = new AsyncCommandManager(ScriptEngine); AsyncCommands = new AsyncCommandManager(ScriptEngine);
} }

14
bin/OpenSim.ini.example
View File

@ -168,8 +168,6 @@ userDatabase_plugin = "OpenSim.Data.SQLite.dll"
; User Source MySQL example ; User Source MySQL example
;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
default_location_x = 1000
default_location_y = 1000
dump_assets_to_file = false dump_assets_to_file = false
@ -177,6 +175,10 @@ dump_assets_to_file = false
http_listener_port = 9000 http_listener_port = 9000
remoting_listener_port = 8895 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 ; 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 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 ; 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] [ScriptEngine.DotNetEngine]
Enabled = true Enabled = true
ScriptDelayFactor = 1.0
ScriptDistanceLimitFactor = 1.0
; ;
; These settings are specific to DotNetEngine script engine ; 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. ; 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 AllowGodFunctions = false
ScriptDelayFactor = 1.0
ScriptDistanceLimitFactor = 1.0
; Maximum number of llListen events we allow per script ; Maximum number of llListen events we allow per script
; Set this to 0 to have no limit imposed. ; Set this to 0 to have no limit imposed.
max_listens_per_script = 64 max_listens_per_script = 64