aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-07-20 21:38:31 +0100
committerMelanie2010-07-20 21:38:31 +0100
commit176cb01130ec7e698ee6bc81e0ee2db9f52e4fcb (patch)
treed4206bc97f35a31486bea97973fbd6f0a4c0621c /OpenSim/Region/Framework/Scenes
parentWhen a god uses mass permission setting, the V bit is cleared from next (diff)
downloadopensim-SC_OLD-176cb01130ec7e698ee6bc81e0ee2db9f52e4fcb.zip
opensim-SC_OLD-176cb01130ec7e698ee6bc81e0ee2db9f52e4fcb.tar.gz
opensim-SC_OLD-176cb01130ec7e698ee6bc81e0ee2db9f52e4fcb.tar.bz2
opensim-SC_OLD-176cb01130ec7e698ee6bc81e0ee2db9f52e4fcb.tar.xz
Remove a merge artefact
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs4
1 files changed, 0 insertions, 4 deletions
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
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);