1 files changed, 97 insertions, 77 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 2a9a2db..8376846 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -78,6 +78,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
        private string m_ScriptErrorMessage;
        private Dictionary<string, string> m_uniqueScripts = new Dictionary<string, string>();
        private bool m_AppDomainLoading;
+        private Dictionary<UUID,ArrayList> m_ScriptErrors =
+                new Dictionary<UUID,ArrayList>();
        // disable warning: need to keep a reference to XEngine.EventManager
        // alive to avoid it being garbage collected
@@ -657,87 +659,97 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap;
-            try
+            lock(m_ScriptErrors)
            {
-                lock (m_AddingAssemblies) 
+                try
                {
-                    m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assembly, out linemap);
+                    lock (m_AddingAssemblies) 
-                    if (!m_AddingAssemblies.ContainsKey(assembly)) {
+                    {
-                        m_AddingAssemblies[assembly] = 1;
+                        m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assembly, out linemap);
-                    } else {
+                        if (!m_AddingAssemblies.ContainsKey(assembly)) {
-                        m_AddingAssemblies[assembly]++;
+                            m_AddingAssemblies[assembly] = 1;
+                        } else {
+                            m_AddingAssemblies[assembly]++;
+                        }
                    }
-                }
-                string[] warnings = m_Compiler.GetWarnings();
+                    string[] warnings = m_Compiler.GetWarnings();
-                if (warnings != null && warnings.Length != 0)
+                    if (warnings != null && warnings.Length != 0)
-                {
-                    foreach (string warning in warnings)
                    {
-                        try
+                        foreach (string warning in warnings)
                        {
-                            // DISPLAY WARNING INWORLD
+                            if (!m_ScriptErrors.ContainsKey(itemID))
-                            string text = "Warning:\n" + warning;
+                                m_ScriptErrors[itemID] = new ArrayList();
-                            if (text.Length > 1000)
-                                text = text.Substring(0, 1000);
+                            m_ScriptErrors[itemID].Add(warning);
-                            if (!ShowScriptSaveResponse(item.OwnerID,
+    //                        try
-                                    assetID, text, true))
+    //                        {
-                            {
+    //                            // DISPLAY WARNING INWORLD
-                                if (presence != null && (!postOnRez))
+    //                            string text = "Warning:\n" + warning;
-                                    presence.ControllingClient.SendAgentAlertMessage("Script saved with warnings, check debug window!", false);
+    //                            if (text.Length > 1000)
+    //                                text = text.Substring(0, 1000);
-                                World.SimChat(Utils.StringToBytes(text),
+    //                            if (!ShowScriptSaveResponse(item.OwnerID,
-                                              ChatTypeEnum.DebugChannel, 2147483647,
+    //                                    assetID, text, true))
-                                              part.AbsolutePosition,
+    //                            {
-                                              part.Name, part.UUID, false);
+    //                                if (presence != null && (!postOnRez))
-                            }
+    //                                    presence.ControllingClient.SendAgentAlertMessage("Script saved with warnings, check debug window!", false);
+    //
+    //                                World.SimChat(Utils.StringToBytes(text),
+    //                                              ChatTypeEnum.DebugChannel, 2147483647,
+    //                                              part.AbsolutePosition,
+    //                                              part.Name, part.UUID, false);
+    //                            }
+    //                        }
+    //                        catch (Exception e2) // LEGIT: User Scripting
+    //                        {
+    //                            m_log.Error("[XEngine]: " +
+    //                                    "Error displaying warning in-world: " +
+    //                                    e2.ToString());
+    //                            m_log.Error("[XEngine]: " +
+    //                                    "Warning:\r\n" +
+    //                                    warning);
+    //                        }
                        }
-                        catch (Exception e2) // LEGIT: User Scripting
-                        {
-                            m_log.Error("[XEngine]: " +
-                                    "Error displaying warning in-world: " +
-                                    e2.ToString());
-                            m_log.Error("[XEngine]: " +
-                                    "Warning:\r\n" +
-                                    warning);
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                try
-                {
-                    // DISPLAY ERROR INWORLD
-                    m_ScriptErrorMessage += "Failed to compile script in object: '" + part.ParentGroup.RootPart.Name + "' Script name: '" + item.Name + "' Error message: " + e.Message.ToString();
-                    m_ScriptFailCount++;
-                    string text = "Error compiling script '" + item.Name + "':\n" + e.Message.ToString();
-                    if (text.Length > 1000)
-                        text = text.Substring(0, 1000);
-                    if (!ShowScriptSaveResponse(item.OwnerID,
-                            assetID, text, false))
-                    {
-                        if (presence != null && (!postOnRez))
-                            presence.ControllingClient.SendAgentAlertMessage("Script saved with errors, check debug window!", false);
-                        World.SimChat(Utils.StringToBytes(text),
-                                      ChatTypeEnum.DebugChannel, 2147483647,
-                                      part.AbsolutePosition,
-                                      part.Name, part.UUID, false);
                    }
                }
-                catch (Exception e2) // LEGIT: User Scripting
+                catch (Exception e)
                {
-                    m_log.Error("[XEngine]: "+
+    //                try
-                            "Error displaying error in-world: " +
+    //                {
-                            e2.ToString());
+                        if (!m_ScriptErrors.ContainsKey(itemID))
-                    m_log.Error("[XEngine]: " +
+                            m_ScriptErrors[itemID] = new ArrayList();
-                            "Errormessage: Error compiling script:\r\n" +
+                        // DISPLAY ERROR INWORLD
-                            e.Message.ToString());
+    //                    m_ScriptErrorMessage += "Failed to compile script in object: '" + part.ParentGroup.RootPart.Name + "' Script name: '" + item.Name + "' Error message: " + e.Message.ToString();
-                }
+    //
+                        m_ScriptFailCount++;
+                        m_ScriptErrors[itemID].Add(e.Message.ToString());
+    //                    string text = "Error compiling script '" + item.Name + "':\n" + e.Message.ToString();
+    //                    if (text.Length > 1000)
+    //                        text = text.Substring(0, 1000);
+    //                    if (!ShowScriptSaveResponse(item.OwnerID,
+    //                            assetID, text, false))
+    //                    {
+    //                        if (presence != null && (!postOnRez))
+    //                            presence.ControllingClient.SendAgentAlertMessage("Script saved with errors, check debug window!", false);
+    //                        World.SimChat(Utils.StringToBytes(text),
+    //                                      ChatTypeEnum.DebugChannel, 2147483647,
+    //                                      part.AbsolutePosition,
+    //                                      part.Name, part.UUID, false);
+    //                    }
+    //                }
+    //                catch (Exception e2) // LEGIT: User Scripting
+    //                {
+    //                    m_log.Error("[XEngine]: "+
+    //                            "Error displaying error in-world: " +
+    //                            e2.ToString());
+    //                    m_log.Error("[XEngine]: " +
+    //                            "Errormessage: Error compiling script:\r\n" +
+    //                            e.Message.ToString());
+    //                }
-                return false;
+                    return false;
+                }
            }
            
@@ -1252,7 +1264,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            return UUID.Zero;
        }
-        [DebuggerNonUserCode]
        public void SetState(UUID itemID, string newState)
        {
            IScriptInstance instance = GetInstance(itemID);
@@ -1260,13 +1271,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                return;
            instance.SetState(newState);
        }
-        public string GetState(UUID itemID)
-        {
-            IScriptInstance instance = GetInstance(itemID);
-            if (instance == null)
-                return "default";
-            return instance.State;
-        }
        public int GetStartParameter(UUID itemID)
        {
@@ -1552,5 +1556,21 @@ namespace OpenSim.Region.ScriptEngine.XEngine
            return true;
        }
+        public ArrayList GetScriptErrors(UUID itemID)
+        {
+            System.Threading.Thread.Sleep(1000);
+            lock (m_ScriptErrors)
+            {
+                if (m_ScriptErrors.ContainsKey(itemID))
+                {
+                    ArrayList ret = m_ScriptErrors[itemID];
+                    m_ScriptErrors.Remove(itemID);
+                    return ret;
+                }
+                return new ArrayList();
+            }
+        }
    }
 }

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 2a9a2db..8376846 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -78,6 +78,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
78	private string m_ScriptErrorMessage;	78	private string m_ScriptErrorMessage;
79	private Dictionary<string, string> m_uniqueScripts = new Dictionary<string, string>();	79	private Dictionary<string, string> m_uniqueScripts = new Dictionary<string, string>();
80	private bool m_AppDomainLoading;	80	private bool m_AppDomainLoading;
		81	private Dictionary<UUID,ArrayList> m_ScriptErrors =
		82	new Dictionary<UUID,ArrayList>();
81		83
82	// disable warning: need to keep a reference to XEngine.EventManager	84	// disable warning: need to keep a reference to XEngine.EventManager
83	// alive to avoid it being garbage collected	85	// alive to avoid it being garbage collected
@@ -657,87 +659,97 @@ namespace OpenSim.Region.ScriptEngine.XEngine
657		659
658	Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap;	660	Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap;
659		661
660	try	662	lock(m_ScriptErrors)
661	{	663	{
662	lock (m_AddingAssemblies)	664	try
663	{	665	{
664	m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assembly, out linemap);	666	lock (m_AddingAssemblies)
665	if (!m_AddingAssemblies.ContainsKey(assembly)) {	667	{
666	m_AddingAssemblies[assembly] = 1;	668	m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assembly, out linemap);
667	} else {	669	if (!m_AddingAssemblies.ContainsKey(assembly)) {
668	m_AddingAssemblies[assembly]++;	670	m_AddingAssemblies[assembly] = 1;
		671	} else {
		672	m_AddingAssemblies[assembly]++;
		673	}
669	}	674	}
670	}
671		675
672	string[] warnings = m_Compiler.GetWarnings();	676	string[] warnings = m_Compiler.GetWarnings();
673		677
674	if (warnings != null && warnings.Length != 0)	678	if (warnings != null && warnings.Length != 0)
675	{
676	foreach (string warning in warnings)
677	{	679	{
678	try	680	foreach (string warning in warnings)
679	{	681	{
680	// DISPLAY WARNING INWORLD	682	if (!m_ScriptErrors.ContainsKey(itemID))
681	string text = "Warning:\n" + warning;	683	m_ScriptErrors[itemID] = new ArrayList();
682	if (text.Length > 1000)	684
683	text = text.Substring(0, 1000);	685	m_ScriptErrors[itemID].Add(warning);
684	if (!ShowScriptSaveResponse(item.OwnerID,	686	// try
685	assetID, text, true))	687	// {
686	{	688	// // DISPLAY WARNING INWORLD
687	if (presence != null && (!postOnRez))	689	// string text = "Warning:\n" + warning;
688	presence.ControllingClient.SendAgentAlertMessage("Script saved with warnings, check debug window!", false);	690	// if (text.Length > 1000)
689		691	// text = text.Substring(0, 1000);
690	World.SimChat(Utils.StringToBytes(text),	692	// if (!ShowScriptSaveResponse(item.OwnerID,
691	ChatTypeEnum.DebugChannel, 2147483647,	693	// assetID, text, true))
692	part.AbsolutePosition,	694	// {
693	part.Name, part.UUID, false);	695	// if (presence != null && (!postOnRez))
694	}	696	// presence.ControllingClient.SendAgentAlertMessage("Script saved with warnings, check debug window!", false);
		697	//
		698	// World.SimChat(Utils.StringToBytes(text),
		699	// ChatTypeEnum.DebugChannel, 2147483647,
		700	// part.AbsolutePosition,
		701	// part.Name, part.UUID, false);
		702	// }
		703	// }
		704	// catch (Exception e2) // LEGIT: User Scripting
		705	// {
		706	// m_log.Error("[XEngine]: " +
		707	// "Error displaying warning in-world: " +
		708	// e2.ToString());
		709	// m_log.Error("[XEngine]: " +
		710	// "Warning:\r\n" +
		711	// warning);
		712	// }
695	}	713	}
696	catch (Exception e2) // LEGIT: User Scripting
697	{
698	m_log.Error("[XEngine]: " +
699	"Error displaying warning in-world: " +
700	e2.ToString());
701	m_log.Error("[XEngine]: " +
702	"Warning:\r\n" +
703	warning);
704	}
705	}
706	}
707	}
708	catch (Exception e)
709	{
710	try
711	{
712	// DISPLAY ERROR INWORLD
713	m_ScriptErrorMessage += "Failed to compile script in object: '" + part.ParentGroup.RootPart.Name + "' Script name: '" + item.Name + "' Error message: " + e.Message.ToString();
714
715	m_ScriptFailCount++;
716	string text = "Error compiling script '" + item.Name + "':\n" + e.Message.ToString();
717	if (text.Length > 1000)
718	text = text.Substring(0, 1000);
719	if (!ShowScriptSaveResponse(item.OwnerID,
720	assetID, text, false))
721	{
722	if (presence != null && (!postOnRez))
723	presence.ControllingClient.SendAgentAlertMessage("Script saved with errors, check debug window!", false);
724	World.SimChat(Utils.StringToBytes(text),
725	ChatTypeEnum.DebugChannel, 2147483647,
726	part.AbsolutePosition,
727	part.Name, part.UUID, false);
728	}	714	}
729	}	715	}
730	catch (Exception e2) // LEGIT: User Scripting	716	catch (Exception e)
731	{	717	{
732	m_log.Error("[XEngine]: "+	718	// try
733	"Error displaying error in-world: " +	719	// {
734	e2.ToString());	720	if (!m_ScriptErrors.ContainsKey(itemID))
735	m_log.Error("[XEngine]: " +	721	m_ScriptErrors[itemID] = new ArrayList();
736	"Errormessage: Error compiling script:\r\n" +	722	// DISPLAY ERROR INWORLD
737	e.Message.ToString());	723	// m_ScriptErrorMessage += "Failed to compile script in object: '" + part.ParentGroup.RootPart.Name + "' Script name: '" + item.Name + "' Error message: " + e.Message.ToString();
738	}	724	//
		725	m_ScriptFailCount++;
		726	m_ScriptErrors[itemID].Add(e.Message.ToString());
		727	// string text = "Error compiling script '" + item.Name + "':\n" + e.Message.ToString();
		728	// if (text.Length > 1000)
		729	// text = text.Substring(0, 1000);
		730	// if (!ShowScriptSaveResponse(item.OwnerID,
		731	// assetID, text, false))
		732	// {
		733	// if (presence != null && (!postOnRez))
		734	// presence.ControllingClient.SendAgentAlertMessage("Script saved with errors, check debug window!", false);
		735	// World.SimChat(Utils.StringToBytes(text),
		736	// ChatTypeEnum.DebugChannel, 2147483647,
		737	// part.AbsolutePosition,
		738	// part.Name, part.UUID, false);
		739	// }
		740	// }
		741	// catch (Exception e2) // LEGIT: User Scripting
		742	// {
		743	// m_log.Error("[XEngine]: "+
		744	// "Error displaying error in-world: " +
		745	// e2.ToString());
		746	// m_log.Error("[XEngine]: " +
		747	// "Errormessage: Error compiling script:\r\n" +
		748	// e.Message.ToString());
		749	// }
739		750
740	return false;	751	return false;
		752	}
741	}	753	}
742		754
743		755
@@ -1252,7 +1264,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1252	return UUID.Zero;	1264	return UUID.Zero;
1253	}	1265	}
1254		1266
1255	[DebuggerNonUserCode]
1256	public void SetState(UUID itemID, string newState)	1267	public void SetState(UUID itemID, string newState)
1257	{	1268	{
1258	IScriptInstance instance = GetInstance(itemID);	1269	IScriptInstance instance = GetInstance(itemID);
@@ -1260,13 +1271,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1260	return;	1271	return;
1261	instance.SetState(newState);	1272	instance.SetState(newState);
1262	}	1273	}
1263	public string GetState(UUID itemID)
1264	{
1265	IScriptInstance instance = GetInstance(itemID);
1266	if (instance == null)
1267	return "default";
1268	return instance.State;
1269	}
1270		1274
1271	public int GetStartParameter(UUID itemID)	1275	public int GetStartParameter(UUID itemID)
1272	{	1276	{
@@ -1552,5 +1556,21 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1552		1556
1553	return true;	1557	return true;
1554	}	1558	}
		1559
		1560	public ArrayList GetScriptErrors(UUID itemID)
		1561	{
		1562	System.Threading.Thread.Sleep(1000);
		1563
		1564	lock (m_ScriptErrors)
		1565	{
		1566	if (m_ScriptErrors.ContainsKey(itemID))
		1567	{
		1568	ArrayList ret = m_ScriptErrors[itemID];
		1569	m_ScriptErrors.Remove(itemID);
		1570	return ret;
		1571	}
		1572	return new ArrayList();
		1573	}
		1574	}
1555	}	1575	}
1556	}	1576	}