OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix Xengine script instance load

avinationmerge
UbitUmarov 2014-07-18 11:43:31 +01:00
parent 19d33c571d
commit d5e0437465
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -1325,12 +1325,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
(m_Scripts[itemID].AssetID != assetID)) (m_Scripts[itemID].AssetID != assetID))
{ {
lockScriptsForRead(false); lockScriptsForRead(false);
instance = new ScriptInstance(this, part, instance = new ScriptInstance(this, part,
item, item,
startParam, postOnRez, startParam, postOnRez,
m_MaxScriptQueue); m_MaxScriptQueue);
if (part.ParentGroup.IsAttachment) if (part.ParentGroup.IsAttachment)
appDomain = part.ParentGroup.RootPart.UUID; appDomain = part.ParentGroup.RootPart.UUID;
@ -1392,8 +1390,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
sandbox = AppDomain.CurrentDomain; sandbox = AppDomain.CurrentDomain;
} }
if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource)) // if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
return false; // return false;
m_AppDomains[appDomain] = sandbox; m_AppDomains[appDomain] = sandbox;
@ -1411,9 +1409,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return false; return false;
} }
} }
instance.Load(m_AppDomains[appDomain], assembly, stateSource);
if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
return false;
// m_log.DebugFormat( // m_log.DebugFormat(
// "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}", // "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
// part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, // part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID,