diff options
| author | Melanie | 2010-04-27 01:11:14 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-27 01:11:14 +0100 |
| commit | edde0be0a0902a5f9cf51df7ceb3325d50c95c6e (patch) | |
| tree | 419d2303c271a64b915824392f823cef88ee9614 /OpenSim | |
| parent | Add a parameter to prim inventory update to prevent event firing (diff) | |
| download | opensim-SC-edde0be0a0902a5f9cf51df7ceb3325d50c95c6e.zip opensim-SC-edde0be0a0902a5f9cf51df7ceb3325d50c95c6e.tar.gz opensim-SC-edde0be0a0902a5f9cf51df7ceb3325d50c95c6e.tar.bz2 opensim-SC-edde0be0a0902a5f9cf51df7ceb3325d50c95c6e.tar.xz | |
Fix build break.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 44c49c5..4da63c0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -633,24 +633,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 633 | { | 633 | { |
| 634 | item.AssetID = m_items[item.ItemID].AssetID; | 634 | item.AssetID = m_items[item.ItemID].AssetID; |
| 635 | } | 635 | } |
| 636 | m_items[item.ItemID] = item; | 636 | m_items[item.ItemID] = item; |
| 637 | m_inventorySerial++; | 637 | m_inventorySerial++; |
| 638 | if (fireScriptEvents) | 638 | if (fireScriptEvents) |
| 639 | m_part.TriggerScriptChangedEvent(Changed.INVENTORY); | 639 | m_part.TriggerScriptChangedEvent(Changed.INVENTORY); |
| 640 | HasInventoryChanged = true; | 640 | HasInventoryChanged = true; |
| 641 | m_part.ParentGroup.HasGroupChanged = true; | 641 | m_part.ParentGroup.HasGroupChanged = true; |
| 642 | m_items.LockItemsForWrite(false); | 642 | return true; |
| 643 | return true; | 643 | } |
| 644 | } | 644 | else |
| 645 | else | 645 | { |
| 646 | { | 646 | m_log.ErrorFormat( |
| 647 | m_log.ErrorFormat( | 647 | "[PRIM INVENTORY]: " + |
| 648 | "[PRIM INVENTORY]: " + | 648 | "Tried to retrieve item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory", |
| 649 | "Tried to retrieve item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory", | 649 | item.ItemID, m_part.Name, m_part.UUID, |
| 650 | item.ItemID, m_part.Name, m_part.UUID, | 650 | m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); |
| 651 | m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); | 651 | } |
| 652 | } | ||
| 653 | 652 | ||
| 653 | } | ||
| 654 | return false; | 654 | return false; |
| 655 | } | 655 | } |
| 656 | } | 656 | } |