2 files changed, 164 insertions, 104 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 09b79d0..0ac8b5c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -356,9 +356,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         // timer: not handled here
         // listen: not handled here
 
-        public void control(uint localID, UUID itemID, UUID agentID, uint held, uint change)
+        public void control(UUID itemID, UUID agentID, uint held, uint change)
         {
-            myScriptEngine.PostObjectEvent(localID, new EventParams(
+            myScriptEngine.PostScriptEvent(itemID, new EventParams(
                     "control",new object[] {
                     new LSL_Types.LSLString(agentID.ToString()),
                     new LSL_Types.LSLInteger(held),
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 4715690..b050349 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -488,6 +488,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             if (stateSource == (int)StateSource.ScriptedRez)
             {
+                lock (m_CompileDict)
+                {
+                    m_CompileDict[itemID] = 0;
+                }
+
                 DoOnRezScript(parms);
             }
             else
@@ -696,9 +701,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 }
             }
 
+            ScriptInstance instance = null;
             lock (m_Scripts)
             {
-                ScriptInstance instance = null;
                 // Create the object record
 
                 if ((!m_Scripts.ContainsKey(itemID)) ||
@@ -765,8 +770,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                                   item.Name, startParam, postOnRez,
                                                   stateSource, m_MaxScriptQueue);
                     
-                    m_log.DebugFormat("[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}",
-                            part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, part.ParentGroup.RootPart.AbsolutePosition.ToString());
+                    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, 
+                        part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
 
                     if (presence != null)
                     {
@@ -779,28 +786,29 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                     m_Scripts[itemID] = instance;
                 }
+            }
 
-                lock (m_PrimObjects)
-                {
-                    if (!m_PrimObjects.ContainsKey(localID))
-                        m_PrimObjects[localID] = new List<UUID>();
+            lock (m_PrimObjects)
+            {
+                if (!m_PrimObjects.ContainsKey(localID))
+                    m_PrimObjects[localID] = new List<UUID>();
 
-                    if (!m_PrimObjects[localID].Contains(itemID))
-                        m_PrimObjects[localID].Add(itemID);
+                if (!m_PrimObjects[localID].Contains(itemID))
+                    m_PrimObjects[localID].Add(itemID);
 
-                }
+            }
 
-                if (!m_Assemblies.ContainsKey(assetID))
-                    m_Assemblies[assetID] = assembly;
+            if (!m_Assemblies.ContainsKey(assetID))
+                m_Assemblies[assetID] = assembly;
 
-                lock (m_AddingAssemblies) 
-                {
-                    m_AddingAssemblies[assembly]--;
-                }
-
-                if (instance!=null) 
-                    instance.Init();
+            lock (m_AddingAssemblies) 
+            {
+                m_AddingAssemblies[assembly]--;
             }
+
+            if (instance != null) 
+                instance.Init();
+
             return true;
         }
 
@@ -813,60 +821,60 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     m_CompileDict.Remove(itemID);
             }
 
+            IScriptInstance instance = null;
+
             lock (m_Scripts)
             {
                 // Do we even have it?
                 if (!m_Scripts.ContainsKey(itemID))
                     return;
 
-                IScriptInstance instance=m_Scripts[itemID];
+                instance=m_Scripts[itemID];
                 m_Scripts.Remove(itemID);
+            }
 
-                instance.ClearQueue();
-                instance.Stop(0);
-
+            instance.ClearQueue();
+            instance.Stop(0);
 //                bool objectRemoved = false;
 
-                lock (m_PrimObjects)
+            lock (m_PrimObjects)
+            {
+                // Remove the script from it's prim
+                if (m_PrimObjects.ContainsKey(localID))
                 {
-                    // Remove the script from it's prim
-                    if (m_PrimObjects.ContainsKey(localID))
-                    {
-                        // Remove inventory item record
-                        if (m_PrimObjects[localID].Contains(itemID))
-                            m_PrimObjects[localID].Remove(itemID);
+                    // Remove inventory item record
+                    if (m_PrimObjects[localID].Contains(itemID))
+                        m_PrimObjects[localID].Remove(itemID);
 
-                        // If there are no more scripts, remove prim
-                        if (m_PrimObjects[localID].Count == 0)
-                        {
-                            m_PrimObjects.Remove(localID);
+                    // If there are no more scripts, remove prim
+                    if (m_PrimObjects[localID].Count == 0)
+                    {
+                        m_PrimObjects.Remove(localID);
 //                            objectRemoved = true;
-                        }
                     }
                 }
+            }
 
-                instance.RemoveState();
-                instance.DestroyScriptInstance();
+            instance.RemoveState();
+            instance.DestroyScriptInstance();
 
-                m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
-                if (m_DomainScripts[instance.AppDomain].Count == 0)
-                {
-                    m_DomainScripts.Remove(instance.AppDomain);
-                    UnloadAppDomain(instance.AppDomain);
-                }
+            m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
+            if (m_DomainScripts[instance.AppDomain].Count == 0)
+            {
+                m_DomainScripts.Remove(instance.AppDomain);
+                UnloadAppDomain(instance.AppDomain);
+            }
 
-                instance = null;
+            instance = null;
 
-                ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
-                if (handlerObjectRemoved != null)
-                {
-                    SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
-                    handlerObjectRemoved(part.UUID);
-                }
-
-                CleanAssemblies();
+            ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
+            if (handlerObjectRemoved != null)
+            {
+                SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
+                handlerObjectRemoved(part.UUID);
             }
 
+
             ScriptRemoved handlerScriptRemoved = OnScriptRemoved;
             if (handlerScriptRemoved != null)
                 handlerScriptRemoved(itemID);
@@ -1000,26 +1008,33 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         public bool PostObjectEvent(uint localID, EventParams p)
         {
             bool result = false;
-            
+            List<UUID> uuids = null;
+
             lock (m_PrimObjects)
             {
                 if (!m_PrimObjects.ContainsKey(localID))
                     return false;
 
-            
-                foreach (UUID itemID in m_PrimObjects[localID])
+                uuids = m_PrimObjects[localID];
+            }
+
+            foreach (UUID itemID in uuids)
+            {
+                IScriptInstance instance = null;
+                try
                 {
                     if (m_Scripts.ContainsKey(itemID))
-                    {
-                        IScriptInstance instance = m_Scripts[itemID];
-                        if (instance != null)
-                        {
-                            instance.PostEvent(p);
-                            result = true;
-                        }
-                    }
+                        instance = m_Scripts[itemID];
+                }
+                catch { /* ignore race conditions */ }
+
+                if (instance != null)
+                {
+                    instance.PostEvent(p);
+                    result = true;
                 }
             }
+            
             return result;
         }
 
@@ -1336,10 +1351,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                     try
                     {
-                        FileStream tfs = File.Open(assemName + ".text",
-                                FileMode.Open, FileAccess.Read);
-                        tfs.Read(tdata, 0, tdata.Length);
-                        tfs.Close();
+                        using (FileStream tfs = File.Open(assemName + ".text",
+                                FileMode.Open, FileAccess.Read))
+                        {
+                            tfs.Read(tdata, 0, tdata.Length);
+                            tfs.Close();
+                        }
 
                         assem = new System.Text.ASCIIEncoding().GetString(tdata);
                     }
@@ -1359,9 +1376,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                     try
                     {
-                        FileStream fs = File.Open(assemName, FileMode.Open, FileAccess.Read);
-                        fs.Read(data, 0, data.Length);
-                        fs.Close();
+                        using (FileStream fs = File.Open(assemName, FileMode.Open, FileAccess.Read))
+                        {
+                            fs.Read(data, 0, data.Length);
+                            fs.Close();
+                        }
 
                         assem = System.Convert.ToBase64String(data);
                     }
@@ -1377,13 +1396,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             if (File.Exists(fn + ".map"))
             {
-                FileStream mfs = File.Open(fn + ".map", FileMode.Open, FileAccess.Read);
-                StreamReader msr = new StreamReader(mfs);
-
-                map = msr.ReadToEnd();
-
-                msr.Close();
-                mfs.Close();
+                using (FileStream mfs = File.Open(fn + ".map", FileMode.Open, FileAccess.Read))
+                {
+                    using (StreamReader msr = new StreamReader(mfs))
+                    {
+                        map = msr.ReadToEnd();
+                        msr.Close();
+                    }
+                    mfs.Close();
+                }
             }
 
             XmlElement assemblyData = doc.CreateElement("", "Assembly", "");
@@ -1471,30 +1492,59 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 {
                     Byte[] filedata = Convert.FromBase64String(base64);
 
-                    FileStream fs = File.Create(path);
-                    fs.Write(filedata, 0, filedata.Length);
-                    fs.Close();
-
-                    fs = File.Create(path + ".text");
-                    StreamWriter sw = new StreamWriter(fs);
-
-                    sw.Write(base64);
-
-                    sw.Close();
-                    fs.Close();
+                    try
+                    {
+                        using (FileStream fs = File.Create(path))
+                        {
+                            fs.Write(filedata, 0, filedata.Length);
+                            fs.Close();
+                        }
+                    }
+                    catch (IOException ex)
+                    {
+                        // if there already exists a file at that location, it may be locked.
+                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
+                    }
+                    try
+                    {
+                        using (FileStream fs = File.Create(path + ".text"))
+                        {
+                            using (StreamWriter sw = new StreamWriter(fs))
+                            {
+                                sw.Write(base64);
+                                sw.Close();
+                            }
+                            fs.Close();
+                        }
+                    }
+                    catch (IOException ex)
+                    {
+                        // if there already exists a file at that location, it may be locked.
+                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
+                    }
                 }
             }
 
             string statepath = Path.Combine("ScriptEngines", World.RegionInfo.RegionID.ToString());
             statepath = Path.Combine(statepath, itemID.ToString() + ".state");
 
-            FileStream sfs = File.Create(statepath);
-            StreamWriter ssw = new StreamWriter(sfs);
-
-            ssw.Write(stateE.OuterXml);
-
-            ssw.Close();
-            sfs.Close();
+            try
+            {
+                using (FileStream sfs = File.Create(statepath))
+                {
+                    using (StreamWriter ssw = new StreamWriter(sfs))
+                    {
+                        ssw.Write(stateE.OuterXml);
+                        ssw.Close();
+                    }
+                    sfs.Close();
+                }
+            }
+            catch (IOException ex)
+            {
+                // if there already exists a file at that location, it may be locked.
+                m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message);
+            }
 
             XmlNodeList mapL = rootE.GetElementsByTagName("LineMap");
             if (mapL.Count > 0)
@@ -1504,13 +1554,23 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 string mappath = Path.Combine("ScriptEngines", World.RegionInfo.RegionID.ToString());
                 mappath = Path.Combine(mappath, mapE.GetAttribute("Filename"));
 
-                FileStream mfs = File.Create(mappath);
-                StreamWriter msw = new StreamWriter(mfs);
-
-                msw.Write(mapE.InnerText);
-
-                msw.Close();
-                mfs.Close();
+                try
+                {
+                    using (FileStream mfs = File.Create(mappath))
+                    {
+                        using (StreamWriter msw = new StreamWriter(mfs))
+                        {
+                            msw.Write(mapE.InnerText);
+                            msw.Close();
+                        }
+                        mfs.Close();
+                    }
+                }
+                catch (IOException ex)
+                {
+                    // if there already exists a file at that location, it may be locked.
+                    m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message);
+                }
             }
 
             return true;