ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination-current'

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
This commit is contained in:
Melanie Thielker
2014-07-19 22:32:07 +02:00
parent 95b89dd450 9654b81b2d
commit e1b2ecdfdc
18 changed files with 709 additions and 1525 deletions
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))
{
lockScriptsForRead(false);
instance = new ScriptInstance(this, part,
instance = new ScriptInstance(this, part,
item,
startParam, postOnRez,
m_MaxScriptQueue);
if (part.ParentGroup.IsAttachment)
appDomain = part.ParentGroup.RootPart.UUID;
@@ -1392,8 +1390,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
sandbox = AppDomain.CurrentDomain;
}
if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
return false;
// if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
// return false;
m_AppDomains[appDomain] = sandbox;
@@ -1411,9 +1409,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return false;
}
}
instance.Load(m_AppDomains[appDomain], assembly, stateSource);
if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
return false;
// m_log.DebugFormat(
// "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
// part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID,