From aba078c93f4966cf6be10fc02228323843b9249e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 14 Oct 2012 17:32:46 +0200
Subject: Fix perms when linking an object. Set root part perms to the perms of
 the link set to make the build floater behave consistently. Fixes permissions
 exploit introduced on 23 August.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index dd9210f..ff8589a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2503,6 +2503,12 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             m_sceneGraph.LinkObjects(root, children);
+
+            ScenePresence sp;
+            if (TryGetScenePresence(agentId, out sp))
+            {
+                root.SendPropertiesToClient(sp.ControllingClient);
+            }
         }
 
         private string PermissionString(uint permissions)
-- 
cgit v1.1


From dc2c198e5df6cd264e9f171a66b1926d850ea361 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 28 Oct 2012 19:09:14 +0100
Subject: Set the script state to new rez when a scriptis saved, rather than
 region start. Prevents CHANGED_REGION_RESTART being sent to scripts when
 saving.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index ff8589a..906c1ee 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -335,7 +335,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 // Needs to determine which engine was running it and use that
                 //
-                errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0);
+                errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 1);
             }
 
             // Tell anyone managing scripts that a script has been reloaded/changed
-- 
cgit v1.1