diff options
author | Melanie | 2010-06-13 03:56:47 +0100 |
---|---|---|
committer | Melanie | 2010-06-13 03:56:47 +0100 |
commit | deaf6bff985aa4a408575cc89e70366ccb79a723 (patch) | |
tree | a76e5365ff31edd14af54eeaa7c18fe33b7622e8 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | Change flavor to 0.7-RC1 (diff) | |
parent | Added Old Guids=true to all MySql connection strings. (diff) | |
download | opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.zip opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.gz opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.bz2 opensim-SC_OLD-deaf6bff985aa4a408575cc89e70366ccb79a723.tar.xz |
Merge branch 'master' into 0.7-post-fixes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 8b83b06..866bb6e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -555,7 +555,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
555 | foreach (TaskInventoryItem item in items) | 555 | foreach (TaskInventoryItem item in items) |
556 | { | 556 | { |
557 | m_items.Add(item.ItemID, item); | 557 | m_items.Add(item.ItemID, item); |
558 | m_part.TriggerScriptChangedEvent(Changed.INVENTORY); | 558 | // m_part.TriggerScriptChangedEvent(Changed.INVENTORY); |
559 | } | 559 | } |
560 | } | 560 | } |
561 | 561 | ||