diff options
| author | Melanie | 2010-07-20 21:38:31 +0100 |
|---|---|---|
| committer | Diva Canto | 2010-07-20 14:53:27 -0700 |
| commit | 9c4380feb27c8c029c6942fd31f2ebff302d8134 (patch) | |
| tree | 7ccb6495b7660ea162a9cfa78d569c020c19b112 /OpenSim/Region/Framework | |
| parent | When a god uses mass permission setting, the V bit is cleared from next (diff) | |
| download | opensim-SC-9c4380feb27c8c029c6942fd31f2ebff302d8134.zip opensim-SC-9c4380feb27c8c029c6942fd31f2ebff302d8134.tar.gz opensim-SC-9c4380feb27c8c029c6942fd31f2ebff302d8134.tar.bz2 opensim-SC-9c4380feb27c8c029c6942fd31f2ebff302d8134.tar.xz | |
Remove a merge artefact
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 0ec15c1..21c5368 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -603,10 +603,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 603 | { | 603 | { |
| 604 | item.AssetID = m_items[item.ItemID].AssetID; | 604 | item.AssetID = m_items[item.ItemID].AssetID; |
| 605 | } | 605 | } |
| 606 | else if ((InventoryType)item.Type == InventoryType.Notecard) | ||
| 607 | { | ||
| 608 | ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID); | ||
| 609 | } | ||
| 610 | 606 | ||
| 611 | if (fireScriptEvents) | 607 | if (fireScriptEvents) |
| 612 | m_part.TriggerScriptChangedEvent(Changed.INVENTORY); | 608 | m_part.TriggerScriptChangedEvent(Changed.INVENTORY); |