diff options
author | Justin Clark-Casey (justincc) | 2010-04-16 22:57:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-05-20 23:44:49 +0100 |
commit | 427ae1087fa67088afa23bcf533c63b52b62ae42 (patch) | |
tree | 8935860451042c673d0ed0f424553b1a22c4d316 /OpenSim/Region/CoreModules | |
parent | Don't append ACKs to zerocoded packets. Although this should fine in theory, ... (diff) | |
download | opensim-SC-427ae1087fa67088afa23bcf533c63b52b62ae42.zip opensim-SC-427ae1087fa67088afa23bcf533c63b52b62ae42.tar.gz opensim-SC-427ae1087fa67088afa23bcf533c63b52b62ae42.tar.bz2 opensim-SC-427ae1087fa67088afa23bcf533c63b52b62ae42.tar.xz |
minor: correctly print out missing item id when it can't be found rather than a NullReferenceException
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index 191e859..cabd51c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -314,10 +314,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
314 | { | 314 | { |
315 | // m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID); | 315 | // m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID); |
316 | 316 | ||
317 | UUID requestedItemId = item.ID; | ||
318 | |||
317 | item = m_InventoryService.GetItem(item); | 319 | item = m_InventoryService.GetItem(item); |
318 | 320 | ||
319 | if (null == item) | 321 | if (null == item) |
320 | m_log.ErrorFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Could not find item with id {0}", item.ID); | 322 | m_log.ErrorFormat( |
323 | "[LOCAL INVENTORY SERVICES CONNECTOR]: Could not find item with id {0}", requestedItemId); | ||
321 | 324 | ||
322 | return item; | 325 | return item; |
323 | } | 326 | } |