aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-22 18:56:06 -0700
committerJohn Hurliman2010-04-22 18:56:06 -0700
commit8692ac53f56c8db9942021709e7415b2b2add0c6 (patch)
tree5681611d23f8f89b38d2c19ef032d412fd3fe3d2 /OpenSim/Region/CoreModules/ServiceConnectorsOut
parent* Better error logging for failed SimianGrid web service calls (diff)
parentInsert a ROLLBACK command on migration step failure. This ensures that (diff)
downloadopensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.zip
opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.gz
opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.bz2
opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs5
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 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 }