aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorCharles Krinke2008-10-26 17:01:15 +0000
committerCharles Krinke2008-10-26 17:01:15 +0000
commit2462108bfb46455b132b134f2decb683813dadba (patch)
tree0de9b362fcec4094626d037abce5673c92f8a07b /OpenSim/Region/ScriptEngine
parentDisable terrain brush test until someone with terrain-fu can look (diff)
downloadopensim-SC_OLD-2462108bfb46455b132b134f2decb683813dadba.zip
opensim-SC_OLD-2462108bfb46455b132b134f2decb683813dadba.tar.gz
opensim-SC_OLD-2462108bfb46455b132b134f2decb683813dadba.tar.bz2
opensim-SC_OLD-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
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs12
1 files changed, 4 insertions, 8 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 }