aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 04a4e53..ec35fde 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1325,12 +1325,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1325 (m_Scripts[itemID].AssetID != assetID)) 1325 (m_Scripts[itemID].AssetID != assetID))
1326 { 1326 {
1327 lockScriptsForRead(false); 1327 lockScriptsForRead(false);
1328 instance = new ScriptInstance(this, part, 1328 instance = new ScriptInstance(this, part,
1329 item, 1329 item,
1330 startParam, postOnRez, 1330 startParam, postOnRez,
1331 m_MaxScriptQueue); 1331 m_MaxScriptQueue);
1332
1333
1334 1332
1335 if (part.ParentGroup.IsAttachment) 1333 if (part.ParentGroup.IsAttachment)
1336 appDomain = part.ParentGroup.RootPart.UUID; 1334 appDomain = part.ParentGroup.RootPart.UUID;
@@ -1392,8 +1390,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1392 sandbox = AppDomain.CurrentDomain; 1390 sandbox = AppDomain.CurrentDomain;
1393 } 1391 }
1394 1392
1395 if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource)) 1393// if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
1396 return false; 1394// return false;
1397 1395
1398 m_AppDomains[appDomain] = sandbox; 1396 m_AppDomains[appDomain] = sandbox;
1399 1397
@@ -1411,9 +1409,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1411 return false; 1409 return false;
1412 } 1410 }
1413 } 1411 }
1414
1415 1412
1416 instance.Load(m_AppDomains[appDomain], assembly, stateSource); 1413
1414 if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
1415 return false;
1417// m_log.DebugFormat( 1416// m_log.DebugFormat(
1418// "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}", 1417// "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
1419// part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, 1418// part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID,