diff options
author | Melanie | 2013-01-16 15:47:55 +0000 |
---|---|---|
committer | Melanie | 2013-01-16 15:47:55 +0000 |
commit | 818254916cb562422b3a3301b9f35fafd64ee3fe (patch) | |
tree | e8655f6472b305d43a2f23059c375c90e7004a2b /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-818254916cb562422b3a3301b9f35fafd64ee3fe.zip opensim-SC_OLD-818254916cb562422b3a3301b9f35fafd64ee3fe.tar.gz opensim-SC_OLD-818254916cb562422b3a3301b9f35fafd64ee3fe.tar.bz2 opensim-SC_OLD-818254916cb562422b3a3301b9f35fafd64ee3fe.tar.xz |
JustinCC's core re-merge
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 34fcf0c..2065a46 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1356,12 +1356,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1356 | m_DomainScripts[appDomain].Add(itemID); | 1356 | m_DomainScripts[appDomain].Add(itemID); |
1357 | 1357 | ||
1358 | instance = new ScriptInstance(this, part, | 1358 | instance = new ScriptInstance(this, part, |
1359 | itemID, assetID, assembly, | 1359 | item, |
1360 | m_AppDomains[appDomain], | 1360 | startParam, postOnRez, |
1361 | part.ParentGroup.RootPart.Name, | 1361 | m_MaxScriptQueue); |
1362 | item.Name, startParam, postOnRez, | ||
1363 | stateSource, m_MaxScriptQueue); | ||
1364 | 1362 | ||
1363 | instance.Load(m_AppDomains[appDomain], assembly, stateSource); | ||
1365 | // m_log.DebugFormat( | 1364 | // m_log.DebugFormat( |
1366 | // "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}", | 1365 | // "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}", |
1367 | // part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, | 1366 | // part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, |
@@ -1808,9 +1807,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1808 | IScriptInstance instance = GetInstance(itemID); | 1807 | IScriptInstance instance = GetInstance(itemID); |
1809 | 1808 | ||
1810 | if (instance != null) | 1809 | if (instance != null) |
1810 | { | ||
1811 | instance.Stop(m_WaitForEventCompletionOnScriptStop); | 1811 | instance.Stop(m_WaitForEventCompletionOnScriptStop); |
1812 | } | ||
1812 | else | 1813 | else |
1814 | { | ||
1815 | // m_log.DebugFormat("[XENGINE]: Could not find script with ID {0} to stop in {1}", itemID, World.Name); | ||
1813 | m_runFlags.AddOrUpdate(itemID, false, 240); | 1816 | m_runFlags.AddOrUpdate(itemID, false, 240); |
1817 | } | ||
1814 | } | 1818 | } |
1815 | 1819 | ||
1816 | public DetectParams GetDetectParams(UUID itemID, int idx) | 1820 | public DetectParams GetDetectParams(UUID itemID, int idx) |