diff options
| author | Melanie | 2010-07-20 21:39:20 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-20 21:39:20 +0100 |
| commit | dcf7973c9b680591389825633f3f0ac2b0b2b814 (patch) | |
| tree | 5585233b97365158563d5231f6700ef0080286f7 /OpenSim | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Remove a merge artefact (diff) | |
| download | opensim-SC_OLD-dcf7973c9b680591389825633f3f0ac2b0b2b814.zip opensim-SC_OLD-dcf7973c9b680591389825633f3f0ac2b0b2b814.tar.gz opensim-SC_OLD-dcf7973c9b680591389825633f3f0ac2b0b2b814.tar.bz2 opensim-SC_OLD-dcf7973c9b680591389825633f3f0ac2b0b2b814.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 2ff6a51..144207f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -752,10 +752,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 752 | { | 752 | { |
| 753 | item.AssetID = m_items[item.ItemID].AssetID; | 753 | item.AssetID = m_items[item.ItemID].AssetID; |
| 754 | } | 754 | } |
| 755 | else if ((InventoryType)item.Type == InventoryType.Notecard) | ||
| 756 | { | ||
| 757 | ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID); | ||
| 758 | } | ||
| 759 | 755 | ||
| 760 | m_items[item.ItemID] = item; | 756 | m_items[item.ItemID] = item; |
| 761 | m_inventorySerial++; | 757 | m_inventorySerial++; |