From 176cb01130ec7e698ee6bc81e0ee2db9f52e4fcb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 20 Jul 2010 21:38:31 +0100
Subject: Remove a merge artefact

---
 OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 91d9be3..4a392cb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -603,10 +603,6 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     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)
                     m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-- 
cgit v1.1