aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-07-19 00:06:23 +0100
committerMelanie2010-07-19 00:06:23 +0100
commitf798679b8005e532f933553007cca989112f4a1d (patch)
treea646aee83e759b50842909fa5e1b344645e07bb4 /OpenSim
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-f798679b8005e532f933553007cca989112f4a1d.zip
opensim-SC_OLD-f798679b8005e532f933553007cca989112f4a1d.tar.gz
opensim-SC_OLD-f798679b8005e532f933553007cca989112f4a1d.tar.bz2
opensim-SC_OLD-f798679b8005e532f933553007cca989112f4a1d.tar.xz
A stab in the dark. Revert the compile lockout temporarily. If you know what
this is, you should test it. If you don't, don't use it.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs40
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 0299385..bf7fed8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
122 122
123 private ScriptCompileQueue m_CompileQueue = new ScriptCompileQueue(); 123 private ScriptCompileQueue m_CompileQueue = new ScriptCompileQueue();
124 IWorkItemResult m_CurrentCompile = null; 124 IWorkItemResult m_CurrentCompile = null;
125 private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>(); 125// private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>();
126 126
127 public string ScriptEngineName 127 public string ScriptEngineName
128 { 128 {
@@ -488,20 +488,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
488 488
489 if (stateSource == (int)StateSource.ScriptedRez) 489 if (stateSource == (int)StateSource.ScriptedRez)
490 { 490 {
491 lock (m_CompileDict) 491// lock (m_CompileDict)
492 { 492// {
493 m_CompileDict[itemID] = 0; 493// m_CompileDict[itemID] = 0;
494 } 494// }
495 495
496 DoOnRezScript(parms); 496 DoOnRezScript(parms);
497 } 497 }
498 else 498 else
499 { 499 {
500 m_CompileQueue.Enqueue(parms); 500 m_CompileQueue.Enqueue(parms);
501 lock (m_CompileDict) 501// lock (m_CompileDict)
502 { 502// {
503 m_CompileDict[itemID] = 0; 503// m_CompileDict[itemID] = 0;
504 } 504// }
505 505
506 if (m_CurrentCompile == null) 506 if (m_CurrentCompile == null)
507 { 507 {
@@ -564,12 +564,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
564 bool postOnRez = (bool)p[4]; 564 bool postOnRez = (bool)p[4];
565 StateSource stateSource = (StateSource)p[5]; 565 StateSource stateSource = (StateSource)p[5];
566 566
567 lock(m_CompileDict) 567// lock(m_CompileDict)
568 { 568// {
569 if (!m_CompileDict.ContainsKey(itemID)) 569// if (!m_CompileDict.ContainsKey(itemID))
570 return false; 570// return false;
571 m_CompileDict.Remove(itemID); 571// m_CompileDict.Remove(itemID);
572 } 572// }
573 573
574 // Get the asset ID of the script, so we can check if we 574 // Get the asset ID of the script, so we can check if we
575 // already have it. 575 // already have it.
@@ -814,11 +814,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
814 public void OnRemoveScript(uint localID, UUID itemID) 814 public void OnRemoveScript(uint localID, UUID itemID)
815 { 815 {
816 // If it's not yet been compiled, make sure we don't try 816 // If it's not yet been compiled, make sure we don't try
817 lock (m_CompileDict) 817// lock (m_CompileDict)
818 { 818// {
819 if (m_CompileDict.ContainsKey(itemID)) 819// if (m_CompileDict.ContainsKey(itemID))
820 m_CompileDict.Remove(itemID); 820// m_CompileDict.Remove(itemID);
821 } 821// }
822 822
823 lock (m_Scripts) 823 lock (m_Scripts)
824 { 824 {