aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-04-16 22:57:44 +0100
committerJustin Clark-Casey (justincc)2010-04-16 22:57:44 +0100
commit45563e20e0167cd0349503919a96658ca119d11e (patch)
tree6a8f7003cffc613903d14592f6c2723f349183de /OpenSim
parentrefactor: crudely move the RezMultipleAttachments() method into the Attachmen... (diff)
downloadopensim-SC_OLD-45563e20e0167cd0349503919a96658ca119d11e.zip
opensim-SC_OLD-45563e20e0167cd0349503919a96658ca119d11e.tar.gz
opensim-SC_OLD-45563e20e0167cd0349503919a96658ca119d11e.tar.bz2
opensim-SC_OLD-45563e20e0167cd0349503919a96658ca119d11e.tar.xz
minor: correctly print out missing item id when it can't be found rather than a NullReferenceException
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs1
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index e97d21f..a2f26d5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -311,10 +311,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
311 { 311 {
312// m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID); 312// m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID);
313 313
314 UUID requestedItemId = item.ID;
315
314 item = m_InventoryService.GetItem(item); 316 item = m_InventoryService.GetItem(item);
315 317
316 if (null == item) 318 if (null == item)
317 m_log.ErrorFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Could not find item with id {0}", item.ID); 319 m_log.ErrorFormat(
320 "[LOCAL INVENTORY SERVICES CONNECTOR]: Could not find item with id {0}", requestedItemId);
318 321
319 return item; 322 return item;
320 } 323 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 4a286ac..a90c4b3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -471,7 +471,6 @@ namespace OpenSim.Region.Framework.Scenes
471 return null; 471 return null;
472 } 472 }
473 473
474
475 if (recipientParentFolderId == UUID.Zero) 474 if (recipientParentFolderId == UUID.Zero)
476 { 475 {
477 InventoryFolderBase recipientRootFolder = InventoryService.GetRootFolder(recipientId); 476 InventoryFolderBase recipientRootFolder = InventoryService.GetRootFolder(recipientId);