Merge branch '0.6.9-post-fixes' into careminster

1 files changed, 15 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index a2fceb7..9b16281 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -31,6 +31,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.Collections;
 using System.Reflection;
+using System.Threading;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
@@ -209,6 +210,11 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((int)InventoryType.LSL == item.InvType)
                 {
                     CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
+                    if ((int)InventoryType.LSL == item.InvType)
+                    {
+                        CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
+                        Thread.Sleep(10); // workaround for Mono cpu utilization > 100% bug
+                    }
                 }
             }
         }
@@ -269,7 +275,7 @@ namespace OpenSim.Region.Framework.Scenes
             // m_log.InfoFormat(
             //     "[PRIM INVENTORY]: " +
             //     "Starting script {0}, {1} in prim {2}, {3}",
-            //     item.Name, item.ItemID, Name, UUID);
+            //     item.Name, item.ItemID, m_part.Name, m_part.UUID);
 
             if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
             {
@@ -654,6 +660,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);
@@ -743,6 +750,11 @@ 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;
@@ -896,6 +908,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 +918,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));