diff options
| author | Justin Clarke Casey | 2008-09-19 19:07:20 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-09-19 19:07:20 +0000 |
| commit | fb5014cf5b9d7044aafcf7b11cbddb69a5119649 (patch) | |
| tree | 06a8c1be6520db5fa801f5f7b638a5741691c156 /OpenSim/Region/ScriptEngine/XEngine | |
| parent | * Remove one possible deadlock situation as seen today (diff) | |
| download | opensim-SC_OLD-fb5014cf5b9d7044aafcf7b11cbddb69a5119649.zip opensim-SC_OLD-fb5014cf5b9d7044aafcf7b11cbddb69a5119649.tar.gz opensim-SC_OLD-fb5014cf5b9d7044aafcf7b11cbddb69a5119649.tar.bz2 opensim-SC_OLD-fb5014cf5b9d7044aafcf7b11cbddb69a5119649.tar.xz | |
* Duh, forgot I had undone some of the changes I meant to include in the previous commit
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 7255de4..caaaf34 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -500,8 +500,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 500 | m_DomainScripts[appDomain].Add(itemID); | 500 | m_DomainScripts[appDomain].Add(itemID); |
| 501 | 501 | ||
| 502 | ScriptInstance instance = | 502 | ScriptInstance instance = |
| 503 | new ScriptInstance(this, part.LocalId, | 503 | new ScriptInstance(this, part, |
| 504 | part.UUID, itemID, assetID, assembly, | 504 | itemID, assetID, assembly, |
| 505 | m_AppDomains[appDomain], | 505 | m_AppDomains[appDomain], |
| 506 | part.ParentGroup.RootPart.Name, | 506 | part.ParentGroup.RootPart.Name, |
| 507 | item.Name, startParam, postOnRez, | 507 | item.Name, startParam, postOnRez, |