From 0b16f9eee2f985e1ad48ab66a48346a7f21f63f6 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Sun, 6 Jul 2008 12:35:00 +0000
Subject: [PATCH] * minor: Stop spurious 'item not found' messages when placing
 things into a prim's inventory

---
 .../Environment/Scenes/Scene.Inventory.cs     | 32 +++++++++++++++----
 .../Scenes/SceneObjectPart.Inventory.cs       | 11 ++-----
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 36ca51b08e..9b94e05e9b 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -239,8 +239,14 @@ namespace OpenSim.Region.Environment.Scenes
 
             // Retrieve item
             TaskInventoryItem item = group.GetInventoryItem(part.LocalId, itemId);
+            
             if (null == item)
-            {
+            {                                  
+                m_log.ErrorFormat(
+                    "[PRIM INVENTORY]: Tried to retrieve item ID {0} from prim {1}, {2} for caps script update "
+                        + " but the item does not exist in this inventory",
+                    itemId, part.Name, part.UUID);
+
                 return;
             }
 
@@ -878,7 +884,12 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (null == taskItem)
             {
-                // Console already notified of error in GetInventoryItem
+                m_log.ErrorFormat(
+                    "[PRIM INVENTORY]: Tried to retrieve item ID {0} from prim {1}, {2} for creating an avatar"
+                        + " inventory item from a prim's inventory item "
+                        + " but the required item does not exist in the prim's inventory",
+                    itemId, part.Name, part.UUID);
+
                 return null;
             }
 
@@ -1010,7 +1021,11 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (srcTaskItem == null)
             {
-                // error was already logged
+                m_log.ErrorFormat(
+                    "[PRIM INVENTORY]: Tried to retrieve item ID {0} from prim {1}, {2} for moving"
+                        + " but the item does not exist in this inventory",
+                    itemId, part.Name, part.UUID);
+
                 return;
             }
             
@@ -1143,7 +1158,8 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (part != null)
             {
-                TaskInventoryItem currentItem=part.GetInventoryItem(itemID);
+                TaskInventoryItem currentItem = part.GetInventoryItem(itemID);
+
                 if (currentItem == null)
                 {
                     LLUUID copyID = LLUUID.Random();
@@ -1186,7 +1202,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
                 else // Updating existing item with new perms etc
                 {
-                    TaskInventoryItem prevItem=part.GetInventoryItem(itemID);
+                    TaskInventoryItem prevItem = part.GetInventoryItem(itemID);
                     itemInfo.AssetID = prevItem.AssetID;
                     if (part.UpdateInventoryItem(itemInfo))
                         part.GetProperties(remoteClient);
@@ -1314,7 +1330,11 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (srcTaskItem == null)
             {
-                // error was already logged
+                m_log.ErrorFormat(
+                    "[PRIM INVENTORY]: Tried to retrieve item ID {0} from prim {1}, {2} for rezzing a script but the "
+                        + " item does not exist in this inventory",
+                    srcId, srcPart.Name, srcPart.UUID);
+
                 return;
             }
             
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 7622609aea..7e43b44453 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -272,7 +272,7 @@ namespace OpenSim.Region.Environment.Scenes
             item.ParentID = UUID;
             item.ParentPartID = UUID;
 
-            string name=FindAvailableInventoryName(item.Name);
+            string name = FindAvailableInventoryName(item.Name);
             if (name == String.Empty)
                 return;
 
@@ -346,7 +346,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="itemID"></param>
         /// <returns>null if the item does not exist</returns>
         public TaskInventoryItem GetInventoryItem(LLUUID itemID)
-        {
+        {            
             lock (m_taskInventory)
             {
                 if (m_taskInventory.ContainsKey(itemID))
@@ -357,13 +357,6 @@ namespace OpenSim.Region.Environment.Scenes
 
                     return m_taskInventory[itemID];
                 }
-                else
-                {
-                    m_log.ErrorFormat(
-                        "[PRIM INVENTORY]: " +
-                        "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
-                        itemID, Name, UUID);
-                }
             }
 
             return null;