Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

6 files changed, 95 insertions, 14 deletions

diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 248502e..be2b8c8 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -124,6 +124,9 @@ namespace OpenSim.Framework
         private UUID _oldID = UUID.Zero;
 
         private bool _ownerChanged = false;
+        
+        // This used ONLY during copy. It can't be relied on at other times!
+        private bool _scriptRunning = true;
 
         public UUID AssetID {
             get {
@@ -387,6 +390,15 @@ namespace OpenSim.Framework
             }
         }
 
+        public bool ScriptRunning {
+            get {
+                return _scriptRunning;
+            }
+            set {
+                _scriptRunning = value;
+            }
+        }
+
         // See ICloneable
 
         #region ICloneable Members
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index fecdd1b..4a3c634 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -50,5 +50,7 @@ namespace OpenSim.Region.Framework.Interfaces
         void ResumeScript(UUID itemID);
 
         ArrayList GetScriptErrors(UUID itemID);
+
+        bool HasScript(UUID itemID, out bool running);
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 682c36d..1f32362 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2025,6 +2025,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running)
         {
+            if (!Permissions.CanEditScript(itemID, objectID, controllingClient.AgentId))
+                return;
+
             SceneObjectPart part = GetSceneObjectPart(objectID);
             if (part == null)
                 return;
@@ -2168,5 +2171,15 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_sceneGraph.LinkObjects(root, children);
         }
+
+        private string PermissionString(uint permissions)
+        {
+            PermissionMask perms = (PermissionMask)permissions &
+                    (PermissionMask.Move |
+                     PermissionMask.Copy |
+                     PermissionMask.Transfer |
+                     PermissionMask.Modify);
+            return perms.ToString();
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 304de67..6e0fc43 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2857,8 +2857,12 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
+                RootPart.UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
                 for (int i = 0; i < parts.Length; i++)
-                    parts[i].UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
+                {
+                    if (parts[i] != RootPart)
+                        parts[i].UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
+                }
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 970003a..3b1ab01 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -48,6 +48,7 @@ namespace OpenSim.Region.Framework.Scenes
         private string m_inventoryFileName = String.Empty;
         private byte[] m_inventoryFileData = new byte[0];
         private uint m_inventoryFileNameSerial = 0;
+        private bool m_inventoryPrivileged = false;
 
         private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>();
         
@@ -93,6 +94,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_items = value;
                 m_inventorySerial++;
+                QueryScriptStates();
             }
         }
         
@@ -225,6 +227,36 @@ namespace OpenSim.Region.Framework.Scenes
             m_items.LockItemsForWrite(false);
         }
 
+        private void QueryScriptStates()
+        {
+            if (m_part == null || m_part.ParentGroup == null)
+                return;
+
+            IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
+            if (engines == null) // No engine at all
+                return;
+
+            Items.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in Items.Values)
+            {
+                if (item.InvType == (int)InventoryType.LSL)
+                {
+                    foreach (IScriptModule e in engines)
+                    {
+                        bool running;
+
+                        if (e.HasScript(item.ItemID, out running))
+                        {
+                            item.ScriptRunning = running;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            Items.LockItemsForRead(false);
+        }
+
         /// <summary>
         /// Start all the scripts contained in this prim's inventory
         /// </summary>
@@ -348,6 +380,9 @@ namespace OpenSim.Region.Framework.Scenes
                     m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
                         m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
                     StoreScriptErrors(item.ItemID, null);
+                    if (!item.ScriptRunning)
+                        m_part.ParentGroup.Scene.EventManager.TriggerStopScript(
+                            m_part.LocalId, item.ItemID);
                     m_part.ParentGroup.AddActiveScriptCount(1);
                     m_part.ScheduleFullUpdate();
                 }
@@ -952,6 +987,13 @@ namespace OpenSim.Region.Framework.Scenes
         {
             bool changed = CreateInventoryFileName();
 
+            bool includeAssets = false;
+            if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId))
+                includeAssets = true;
+
+            if (m_inventoryPrivileged != includeAssets)
+                changed = true;
+
             InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
 
             Items.LockItemsForRead(true);
@@ -977,9 +1019,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            bool includeAssets = false;
-            if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId))
-                includeAssets = true;
+            m_inventoryPrivileged = includeAssets;
 
             foreach (TaskInventoryItem item in m_items.Values)
             {
@@ -1123,16 +1163,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             foreach (TaskInventoryItem item in m_items.Values)
             {
-                if (item.InvType != (int)InventoryType.Object)
-                {
-                    if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
-                        mask &= ~((uint)PermissionMask.Copy >> 13);
-                    if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
-                        mask &= ~((uint)PermissionMask.Transfer >> 13);
-                    if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
-                        mask &= ~((uint)PermissionMask.Modify >> 13);
-                }
-                else
+                if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
+                    mask &= ~((uint)PermissionMask.Copy >> 13);
+                if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
+                    mask &= ~((uint)PermissionMask.Transfer >> 13);
+                if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
+                    mask &= ~((uint)PermissionMask.Modify >> 13);
+
+                if (item.InvType == (int)InventoryType.Object)
                 {
                     if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
                         mask &= ~((uint)PermissionMask.Copy >> 13);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 35cc65b..6bdd4c8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1695,5 +1695,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             instance.Resume();
         }
+
+        public bool HasScript(UUID itemID, out bool running)
+        {
+            running = true;
+
+            IScriptInstance instance = GetInstance(itemID);
+            if (instance == null)
+                return false;
+
+            running = instance.Running;
+            return true;
+        }
     }
 }