aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-06-12 06:57:10 +0100
committerMelanie2010-06-12 06:57:10 +0100
commit57a60282f5746a3aa73c0cac34059fbdbd319c0c (patch)
treeb65a10cb75ac67451ff2dca9ba23009ed42c7ad3 /OpenSim/Region
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-57a60282f5746a3aa73c0cac34059fbdbd319c0c.zip
opensim-SC-57a60282f5746a3aa73c0cac34059fbdbd319c0c.tar.gz
opensim-SC-57a60282f5746a3aa73c0cac34059fbdbd319c0c.tar.bz2
opensim-SC-57a60282f5746a3aa73c0cac34059fbdbd319c0c.tar.xz
Don't filre CHANGED_INVENTORY if a prim comes in from storage
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index c4cff12..c3cdca8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -681,7 +681,7 @@ namespace OpenSim.Region.Framework.Scenes
681 foreach (TaskInventoryItem item in items) 681 foreach (TaskInventoryItem item in items)
682 { 682 {
683 m_items.Add(item.ItemID, item); 683 m_items.Add(item.ItemID, item);
684 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 684// m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
685 } 685 }
686 m_items.LockItemsForWrite(false); 686 m_items.LockItemsForWrite(false);
687 687