1 files changed, 99 insertions, 47 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index a2fceb7..62b44bd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -34,7 +34,6 @@ using System.Reflection;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Scripting;
 
@@ -213,7 +212,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        private ArrayList GetScriptErrors(UUID itemID)
+        public ArrayList GetScriptErrors(UUID itemID)
         {
             ArrayList ret = new ArrayList();
 
@@ -296,38 +295,36 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
                 }
 
-                m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString(), this, delegate(string id, object sender, AssetBase asset)
-                               {
-                                   if (null == asset)
-                                   {
-                                       string msg = String.Format("asset ID {0} could not be found", item.AssetID);
-                                       StoreScriptError(item.ItemID, msg);
-                                       m_log.ErrorFormat(
-                                           "[PRIM INVENTORY]: " +
-                                           "Couldn't start script {0}, {1} at {2} in {3} since {4}",
-                                           item.Name, item.ItemID, m_part.AbsolutePosition, 
-                                           m_part.ParentGroup.Scene.RegionInfo.RegionName, msg);
-                                   }
-                                   else
-                                   {
-                                       if (m_part.ParentGroup.m_savedScriptState != null)
-                                           RestoreSavedScriptState(item.OldItemID, item.ItemID);
-                                       m_items.LockItemsForWrite(true);
-                                       m_items[item.ItemID].PermsMask = 0;
-                                       m_items[item.ItemID].PermsGranter = UUID.Zero;
-                                       m_items.LockItemsForWrite(false);
-                                       string script = Utils.BytesToString(asset.Data);
-                                       m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
-                                            m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
-                                       StoreScriptErrors(item.ItemID, null);
-                                       m_part.ParentGroup.AddActiveScriptCount(1);
-                                       m_part.ScheduleFullUpdate();
-                                   }
-                               });
-            }
-            else
-            {
-                StoreScriptError(item.ItemID, "scripts disabled");
+                AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
+                if (null == asset)
+                {
+                    string msg = String.Format("asset ID {0} could not be found", item.AssetID);
+                    StoreScriptError(item.ItemID, msg);
+                    m_log.ErrorFormat(
+                        "[PRIM INVENTORY]: " +
+                        "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
+                        item.Name, item.ItemID, m_part.AbsolutePosition, 
+                        m_part.ParentGroup.Scene.RegionInfo.RegionName, item.AssetID);
+                }
+                else
+                {
+                    if (m_part.ParentGroup.m_savedScriptState != null)
+                        RestoreSavedScriptState(item.OldItemID, item.ItemID);
+
+                    m_items.LockItemsForWrite(true);
+
+                    m_items[item.ItemID].PermsMask = 0;
+                    m_items[item.ItemID].PermsGranter = UUID.Zero;
+
+                    m_items.LockItemsForWrite(false);
+                
+                    string script = Utils.BytesToString(asset.Data);
+                    m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
+                        m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
+                    StoreScriptErrors(item.ItemID, null);
+                    m_part.ParentGroup.AddActiveScriptCount(1);
+                    m_part.ScheduleFullUpdate();
+                }
             }
         }
 
@@ -654,6 +651,7 @@ namespace OpenSim.Region.Framework.Scenes
             item.ParentID = m_part.UUID;
             item.ParentPartID = m_part.UUID;
             item.Name = name;
+            item.GroupID = m_part.GroupID;
 
             m_items.LockItemsForWrite(true);
             m_items.Add(item.ItemID, item);
@@ -716,15 +714,16 @@ namespace OpenSim.Region.Framework.Scenes
         {
             IList<TaskInventoryItem> items = new List<TaskInventoryItem>();
 
-            lock (m_items)
+            m_items.LockItemsForRead(true);
+
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
-                {
-                    if (item.Name == name)
-                        items.Add(item);
-                }
+                if (item.Name == name)
+                    items.Add(item);
             }
 
+            m_items.LockItemsForRead(false);
+
             return items;
         }
         
@@ -736,6 +735,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>false if the item did not exist, true if the update occurred successfully</returns>
         public bool UpdateInventoryItem(TaskInventoryItem item)
         {
+            return UpdateInventoryItem(item, true);
+        }
+
+        public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents)
+        {
             m_items.LockItemsForWrite(true);
 
             if (m_items.ContainsKey(item.ItemID))
@@ -743,6 +747,12 @@ namespace OpenSim.Region.Framework.Scenes
                 item.ParentID = m_part.UUID;
                 item.ParentPartID = m_part.UUID;
                 item.Flags = m_items[item.ItemID].Flags;
+
+                // If group permissions have been set on, check that the groupID is up to date in case it has
+                // changed since permissions were last set.
+                if (item.GroupPermissions != (uint)PermissionMask.None)
+                    item.GroupID = m_part.GroupID;
+                    
                 if (item.AssetID == UUID.Zero)
                 {
                     item.AssetID = m_items[item.ItemID].AssetID;
@@ -760,8 +770,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 m_items[item.ItemID] = item;
                 m_inventorySerial++;
-                m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-
+                if (fireScriptEvents)
+                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
                 HasInventoryChanged = true;
                 m_part.ParentGroup.HasGroupChanged = true;
                 m_items.LockItemsForWrite(false);
@@ -896,6 +906,7 @@ namespace OpenSim.Region.Framework.Scenes
                 uint everyoneMask = 0;
                 uint baseMask = item.BasePermissions;
                 uint ownerMask = item.CurrentPermissions;
+                uint groupMask = item.GroupPermissions;
 
                 invString.AddItemStart();
                 invString.AddNameValueLine("item_id", item.ItemID.ToString());
@@ -905,7 +916,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
                 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
-                invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0));
+                invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
                 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
                 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
 
@@ -1071,12 +1082,11 @@ namespace OpenSim.Region.Framework.Scenes
                         item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
                     item.CurrentPermissions |= 8;
                 }
+                item.OwnerChanged = true;
                 item.CurrentPermissions &= item.NextPermissions;
                 item.BasePermissions &= item.NextPermissions;
                 item.EveryonePermissions &= item.NextPermissions;
             }
-
-            m_part.TriggerScriptChangedEvent(Changed.OWNER);
         }
 
         public void ApplyGodPermissions(uint perms)
@@ -1112,6 +1122,11 @@ namespace OpenSim.Region.Framework.Scenes
         
         public Dictionary<UUID, string> GetScriptStates()
         {
+            return GetScriptStates(false);
+        }
+
+        public Dictionary<UUID, string> GetScriptStates(bool oldIDs)
+        {
             IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
 
             Dictionary<UUID, string> ret = new Dictionary<UUID, string>();
@@ -1129,8 +1144,16 @@ namespace OpenSim.Region.Framework.Scenes
                             string n = e.GetXMLState(item.ItemID);
                             if (n != String.Empty)
                             {
-                                if (!ret.ContainsKey(item.ItemID))
-                                    ret[item.ItemID] = n;
+                                if (oldIDs)
+                                {
+                                    if (!ret.ContainsKey(item.OldItemID))
+                                        ret[item.OldItemID] = n;
+                                }
+                                else
+                                {
+                                    if (!ret.ContainsKey(item.ItemID))
+                                        ret[item.ItemID] = n;
+                                }
                                 break;
                             }
                         }
@@ -1139,5 +1162,34 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return ret;
         }
+        
+        public void ResumeScripts()
+        {
+            IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
+            if (engines == null)
+                return;
+
+
+            Items.LockItemsForRead(true);
+
+            foreach (TaskInventoryItem item in m_items.Values)
+            {
+                if (item.InvType == (int)InventoryType.LSL)
+                {
+                    foreach (IScriptModule engine in engines)
+                    {
+                        if (engine != null)
+                        {
+                            if (item.OwnerChanged)
+                                engine.PostScriptEvent(item.ItemID, "changed", new Object[] { (int)Changed.OWNER });
+                            item.OwnerChanged = false;
+                            engine.ResumeScript(item.ItemID);
+                        }
+                    }
+                }
+            }
+
+            Items.LockItemsForRead(false);
+        }
     }
 }