aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorMelanie2010-05-16 15:02:23 +0100
committerMelanie2010-05-16 15:02:23 +0100
commita723225179503cf24b37471094208fd53281489c (patch)
treeff086095ff8424eb311ca73b5e8a1b069c76af87 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentAdd some debug output to GetAgent to try and track down our presence problems (diff)
downloadopensim-SC-a723225179503cf24b37471094208fd53281489c.zip
opensim-SC-a723225179503cf24b37471094208fd53281489c.tar.gz
opensim-SC-a723225179503cf24b37471094208fd53281489c.tar.bz2
opensim-SC-a723225179503cf24b37471094208fd53281489c.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-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 62b44bd..c4cff12 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -840,12 +840,12 @@ namespace OpenSim.Region.Framework.Scenes
840 } 840 }
841 else 841 else
842 { 842 {
843 m_items.LockItemsForRead(false);
843 m_log.ErrorFormat( 844 m_log.ErrorFormat(
844 "[PRIM INVENTORY]: " + 845 "[PRIM INVENTORY]: " +
845 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 846 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
846 itemID, m_part.Name, m_part.UUID); 847 itemID, m_part.Name, m_part.UUID);
847 } 848 }
848 m_items.LockItemsForWrite(false);
849 849
850 return -1; 850 return -1;
851 } 851 }