From 78605baab330f850f1b47d205b4041d59080a00c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 15 Jul 2010 20:03:08 +0200
Subject: Fix a few permissions vulnerability. Owners could cause permissions
 escalation on items contained in prims using a hacked viewer

---
 OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 517b387..91d9be3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -600,12 +600,12 @@ namespace OpenSim.Region.Framework.Scenes
                     item.GroupID = m_part.GroupID;
                         
                 if (item.AssetID == UUID.Zero)
-                    item.AssetID = it.AssetID;
-
-                lock (m_items)
                 {
-                    m_items[item.ItemID] = item;
-                    m_inventorySerial++;
+                    item.AssetID = m_items[item.ItemID].AssetID;
+                }
+                else if ((InventoryType)item.Type == InventoryType.Notecard)
+                {
+                    ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID);
                 }
 
                 if (fireScriptEvents)
-- 
cgit v1.1