aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 2848441..05a4f76 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -395,13 +395,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
395 m_Scripts[itemID] = instance; 395 m_Scripts[itemID] = instance;
396 } 396 }
397 397
398 if(!m_PrimObjects.ContainsKey(localID)) 398 if (!m_PrimObjects.ContainsKey(localID))
399 m_PrimObjects[localID] = new List<LLUUID>(); 399 m_PrimObjects[localID] = new List<LLUUID>();
400 400
401 if(!m_PrimObjects[localID].Contains(itemID)) 401 if (!m_PrimObjects[localID].Contains(itemID))
402 m_PrimObjects[localID].Add(itemID); 402 m_PrimObjects[localID].Add(itemID);
403 403
404 if(!m_Assemblies.ContainsKey(assetID)) 404 if (!m_Assemblies.ContainsKey(assetID))
405 m_Assemblies[assetID] = assembly; 405 m_Assemblies[assetID] = assembly;
406 } 406 }
407 return true; 407 return true;
@@ -930,14 +930,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
930 result = m_CurrentResult; 930 result = m_CurrentResult;
931 } 931 }
932 932
933 if(result == null) 933 if (result == null)
934 return true; 934 return true;
935 935
936 result.Abort(); 936 result.Abort();
937 937
938 if(SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false)) 938 if (SmartThreadPool.WaitAll(new IWorkItemResult[] {result}, new TimeSpan((long)10000000), false))
939 { 939 {
940 lock(m_EventQueue) 940 lock (m_EventQueue)
941 { 941 {
942 m_CurrentResult = null; 942 m_CurrentResult = null;
943 } 943 }