diff options
author | Melanie Thielker | 2008-08-27 22:53:58 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-27 22:53:58 +0000 |
commit | 5525a3ecb424ce6180198b5f4e440d6d5f065346 (patch) | |
tree | 01526d143e42a05d97b5375e9cfbdc9280c7b243 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Refactor XScriptInstance to IScriptInstance and move into Shared/. Now (diff) | |
download | opensim-SC-5525a3ecb424ce6180198b5f4e440d6d5f065346.zip opensim-SC-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.gz opensim-SC-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.bz2 opensim-SC-5525a3ecb424ce6180198b5f4e440d6d5f065346.tar.xz |
Thank you, salahazar, for a patch that corrects the behavior of
llDetectedLink(). Also a small refactor to remove an interface member
from IScriptEngine.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index c5bcfd5..8fd8a1c 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -319,14 +319,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
319 | get { return false; } | 319 | get { return false; } |
320 | } | 320 | } |
321 | 321 | ||
322 | // | ||
323 | // XEngine functions | ||
324 | // | ||
325 | public int MaxScriptQueue | ||
326 | { | ||
327 | get { return m_MaxScriptQueue; } | ||
328 | } | ||
329 | |||
330 | public void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez) | 322 | public void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez) |
331 | { | 323 | { |
332 | Object[] parms = new Object[] | 324 | Object[] parms = new Object[] |
@@ -508,7 +500,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
508 | m_AppDomains[appDomain], | 500 | m_AppDomains[appDomain], |
509 | part.ParentGroup.RootPart.Name, | 501 | part.ParentGroup.RootPart.Name, |
510 | item.Name, startParam, postOnRez, | 502 | item.Name, startParam, postOnRez, |
511 | StateSource.NewRez); | 503 | StateSource.NewRez, m_MaxScriptQueue); |
512 | 504 | ||
513 | m_log.DebugFormat("[XEngine] Loaded script {0}.{1}", | 505 | m_log.DebugFormat("[XEngine] Loaded script {0}.{1}", |
514 | part.ParentGroup.RootPart.Name, item.Name); | 506 | part.ParentGroup.RootPart.Name, item.Name); |