diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 7622609..7e43b44 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 | |||
272 | item.ParentID = UUID; | 272 | item.ParentID = UUID; |
273 | item.ParentPartID = UUID; | 273 | item.ParentPartID = UUID; |
274 | 274 | ||
275 | string name=FindAvailableInventoryName(item.Name); | 275 | string name = FindAvailableInventoryName(item.Name); |
276 | if (name == String.Empty) | 276 | if (name == String.Empty) |
277 | return; | 277 | return; |
278 | 278 | ||
@@ -346,7 +346,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
346 | /// <param name="itemID"></param> | 346 | /// <param name="itemID"></param> |
347 | /// <returns>null if the item does not exist</returns> | 347 | /// <returns>null if the item does not exist</returns> |
348 | public TaskInventoryItem GetInventoryItem(LLUUID itemID) | 348 | public TaskInventoryItem GetInventoryItem(LLUUID itemID) |
349 | { | 349 | { |
350 | lock (m_taskInventory) | 350 | lock (m_taskInventory) |
351 | { | 351 | { |
352 | if (m_taskInventory.ContainsKey(itemID)) | 352 | if (m_taskInventory.ContainsKey(itemID)) |
@@ -357,13 +357,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
357 | 357 | ||
358 | return m_taskInventory[itemID]; | 358 | return m_taskInventory[itemID]; |
359 | } | 359 | } |
360 | else | ||
361 | { | ||
362 | m_log.ErrorFormat( | ||
363 | "[PRIM INVENTORY]: " + | ||
364 | "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", | ||
365 | itemID, Name, UUID); | ||
366 | } | ||
367 | } | 360 | } |
368 | 361 | ||
369 | return null; | 362 | return null; |