Merge branch 'master' of ssh://TOR/var/git/careminster

7 files changed, 55 insertions, 8 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 89a45da..67395fa 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -26,6 +26,7 @@
  */
 
 using System.Collections.Generic;
+using System.Collections;
 using OpenMetaverse;
 using OpenSim.Framework;
 
@@ -71,6 +72,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Start all the scripts contained in this entity's inventory
         /// </summary>
        void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource);
+        ArrayList GetScriptErrors(UUID itemID);
 
         /// <summary>
         /// Stop all the scripts in this entity.
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index 98efcbe..e90b300 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections;
 using OpenMetaverse;
 
 namespace OpenSim.Region.Framework.Interfaces
@@ -39,5 +40,7 @@ namespace OpenSim.Region.Framework.Interfaces
 
         bool PostScriptEvent(UUID itemID, string name, Object[] args);
         bool PostObjectEvent(UUID itemID, string name, Object[] args);
+
+        ArrayList GetScriptErrors(UUID itemID);
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 7ca779a..bce7d32 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections;
 using System.Reflection;
 using System.Text;
 using System.Timers;
@@ -215,13 +216,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="primID">The prim which contains the item to update</param>
         /// <param name="isScriptRunning">Indicates whether the script to update is currently running</param>
         /// <param name="data"></param>
-        public void CapsUpdateTaskInventoryScriptAsset(IClientAPI remoteClient, UUID itemId,
+        public ArrayList CapsUpdateTaskInventoryScriptAsset(IClientAPI remoteClient, UUID itemId,
                                                        UUID primId, bool isScriptRunning, byte[] data)
         {
             if (!Permissions.CanEditScript(itemId, primId, remoteClient.AgentId))
             {
                 remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false);
-                return;
+                return new ArrayList();
             }
 
             // Retrieve group
@@ -234,7 +235,7 @@ namespace OpenSim.Region.Framework.Scenes
                     "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist",
                     itemId, primId);
 
-                return;
+                return new ArrayList();
             }
 
             // Retrieve item
@@ -247,7 +248,7 @@ namespace OpenSim.Region.Framework.Scenes
                         + " but the item does not exist in this inventory",
                     itemId, part.Name, part.UUID);
 
-                return;
+                return new ArrayList();
             }
 
             AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data);
@@ -264,29 +265,33 @@ namespace OpenSim.Region.Framework.Scenes
             part.GetProperties(remoteClient);
 
             // Trigger rerunning of script (use TriggerRezScript event, see RezScript)
+            ArrayList errors = new ArrayList();
+
             if (isScriptRunning)
             {
                 // Needs to determine which engine was running it and use that
                 //
                 part.Inventory.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0);
+                errors = part.Inventory.GetScriptErrors(item.ItemID);
             }
             else
             {
                 remoteClient.SendAgentAlertMessage("Script saved", false);
             }
+            return errors;
         }
 
         /// <summary>
         /// <see>CapsUpdateTaskInventoryScriptAsset(IClientAPI, UUID, UUID, bool, byte[])</see>
         /// </summary>
-        public void CapsUpdateTaskInventoryScriptAsset(UUID avatarId, UUID itemId,
+        public ArrayList CapsUpdateTaskInventoryScriptAsset(UUID avatarId, UUID itemId,
                                                         UUID primId, bool isScriptRunning, byte[] data)
         {
             ScenePresence avatar;
 
             if (TryGetAvatar(avatarId, out avatar))
             {
-                CapsUpdateTaskInventoryScriptAsset(
+                return CapsUpdateTaskInventoryScriptAsset(
                     avatar.ControllingClient, itemId, primId, isScriptRunning, data);
             }
             else
@@ -295,6 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
                     "[PRIM INVENTORY]: " +
                     "Avatar {0} cannot be found to update its prim item asset",
                     avatarId);
+                return new ArrayList();
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index f74fd5d..b0fb8b3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -542,6 +542,18 @@ namespace OpenSim.Region.Framework.Scenes
                     if (group.GetFromItemID() == itemID)
                     {
                         m_parentScene.SendAttachEvent(group.LocalId, itemID, UUID.Zero);
+                                                bool hasScripts = false;
+                                                foreach (SceneObjectPart part in group.Children.Values)
+                                                {
+                                                        if (part.Inventory.ContainsScripts())
+                                                        {
+                                                                hasScripts = true;
+                                                                break;
+                                                        }
+                                                }
+
+                        if (hasScripts) // Allow the object to execute the attach(NULL_KEY) event
+                            System.Threading.Thread.Sleep(100);
                         group.DetachToInventoryPrep();
                         m_log.Debug("[DETACH]: Saving attachpoint: " +
                                 ((uint)group.GetAttachmentPoint()).ToString());
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index eacd219..f8498c6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1853,7 +1853,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-
+        
         public void rotLookAt(Quaternion target, float strength, float damping)
         {
             SceneObjectPart rootpart = m_rootPart;
@@ -1880,6 +1880,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
+
         public void stopLookAt()
         {
             SceneObjectPart rootpart = m_rootPart;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0eddbfd..6b562e5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2684,7 +2684,7 @@ namespace OpenSim.Region.Framework.Scenes
             ParentGroup.HasGroupChanged = true;
             ScheduleFullUpdate();
         }
-
+        
         /// <summary>
         /// Set the text displayed for this part.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 0321c41..c3c6342 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -29,6 +29,7 @@ using System;
 using System.Xml;
 using System.IO;
 using System.Collections.Generic;
+using System.Collections;
 using System.Reflection;
 using OpenMetaverse;
 using log4net;
@@ -210,6 +211,27 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public ArrayList GetScriptErrors(UUID itemID)
+        {
+            ArrayList ret = new ArrayList();
+
+            IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
+            if (engines == null) // No engine at all
+                return ret;
+
+            foreach (IScriptModule e in engines)
+            {
+                if (e != null)
+                {
+                    ArrayList errors = e.GetScriptErrors(itemID);
+                    foreach (Object line in errors)
+                        ret.Add(line);
+                }
+            }
+
+            return ret;
+        }
+
         /// <summary>
         /// Stop all the scripts in this prim.
         /// </summary>
@@ -345,6 +367,7 @@ namespace OpenSim.Region.Framework.Scenes
                             break;
                     }
                 }
+                m_part.ParentGroup.m_savedScriptState.Remove(oldID);
             }
         }