diff options
author | Charles Krinke | 2008-10-26 17:01:15 +0000 |
---|---|---|
committer | Charles Krinke | 2008-10-26 17:01:15 +0000 |
commit | 2462108bfb46455b132b134f2decb683813dadba (patch) | |
tree | 0de9b362fcec4094626d037abce5673c92f8a07b | |
parent | Disable terrain brush test until someone with terrain-fu can look (diff) | |
download | opensim-SC-2462108bfb46455b132b134f2decb683813dadba.zip opensim-SC-2462108bfb46455b132b134f2decb683813dadba.tar.gz opensim-SC-2462108bfb46455b132b134f2decb683813dadba.tar.bz2 opensim-SC-2462108bfb46455b132b134f2decb683813dadba.tar.xz |
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
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 1462922..8aeca31 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 | |||
87 | m_localID = localID; | 87 | m_localID = localID; |
88 | m_itemID = itemID; | 88 | m_itemID = itemID; |
89 | 89 | ||
90 | IConfigSource config = new IniConfigSource(Application.iniFilePath); | 90 | m_ScriptDelayFactor = |
91 | if (config.Configs["XEngine"] == null) | 91 | m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); |
92 | config.AddConfig("XEngine"); | 92 | m_ScriptDistanceFactor = |
93 | 93 | m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); | |
94 | m_ScriptDelayFactor = config.Configs["XEngine"]. | ||
95 | GetFloat("ScriptDelayFactor", 1.0f); | ||
96 | m_ScriptDistanceFactor = config.Configs["XEngine"]. | ||
97 | GetFloat("ScriptDistanceLimitFactor", 1.0f); | ||
98 | 94 | ||
99 | AsyncCommands = new AsyncCommandManager(ScriptEngine); | 95 | AsyncCommands = new AsyncCommandManager(ScriptEngine); |
100 | } | 96 | } |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 8a5bdd7..09f3462 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -168,8 +168,6 @@ userDatabase_plugin = "OpenSim.Data.SQLite.dll" | |||
168 | ; User Source MySQL example | 168 | ; User Source MySQL example |
169 | ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" | 169 | ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" |
170 | 170 | ||
171 | default_location_x = 1000 | ||
172 | default_location_y = 1000 | ||
173 | dump_assets_to_file = false | 171 | dump_assets_to_file = false |
174 | 172 | ||
175 | 173 | ||
@@ -177,6 +175,10 @@ dump_assets_to_file = false | |||
177 | http_listener_port = 9000 | 175 | http_listener_port = 9000 |
178 | remoting_listener_port = 8895 | 176 | remoting_listener_port = 8895 |
179 | 177 | ||
178 | |||
179 | default_location_x = 1000 | ||
180 | default_location_y = 1000 | ||
181 | |||
180 | ; ssl config: Experimental! The auto https config only really works definately on windows XP now | 182 | ; ssl config: Experimental! The auto https config only really works definately on windows XP now |
181 | ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below | 183 | ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below |
182 | ; you can use https on other platforms, but you'll need to configure the httpapi yourself for now | 184 | ; 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 | |||
494 | 496 | ||
495 | [ScriptEngine.DotNetEngine] | 497 | [ScriptEngine.DotNetEngine] |
496 | Enabled = true | 498 | Enabled = true |
499 | |||
500 | ScriptDelayFactor = 1.0 | ||
501 | ScriptDistanceLimitFactor = 1.0 | ||
502 | |||
503 | |||
497 | ; | 504 | ; |
498 | ; These settings are specific to DotNetEngine script engine | 505 | ; These settings are specific to DotNetEngine script engine |
499 | ; Other script engines based on OpenSim.Region.ScriptEngine.Common.dll will have almost identical settings, but in another section of this config file. | 506 | ; 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 | |||
609 | 616 | ||
610 | AllowGodFunctions = false | 617 | AllowGodFunctions = false |
611 | 618 | ||
612 | ScriptDelayFactor = 1.0 | ||
613 | ScriptDistanceLimitFactor = 1.0 | ||
614 | |||
615 | ; Maximum number of llListen events we allow per script | 619 | ; Maximum number of llListen events we allow per script |
616 | ; Set this to 0 to have no limit imposed. | 620 | ; Set this to 0 to have no limit imposed. |
617 | max_listens_per_script = 64 | 621 | max_listens_per_script = 64 |