diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 4ec5253..97161fc 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
253 | 253 | ||
254 | public InventoryFolderBase GetRootFolder(UUID userID) | 254 | public InventoryFolderBase GetRootFolder(UUID userID) |
255 | { | 255 | { |
256 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetRootFolder for {0}", userID); | 256 | //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetRootFolder for {0}", userID); |
257 | 257 | ||
258 | string invURL = GetInventoryServiceURL(userID); | 258 | string invURL = GetInventoryServiceURL(userID); |
259 | 259 | ||
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
267 | 267 | ||
268 | public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) | 268 | public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) |
269 | { | 269 | { |
270 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetFolderForType {0} type {1}", userID, type); | 270 | //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetFolderForType {0} type {1}", userID, type); |
271 | 271 | ||
272 | string invURL = GetInventoryServiceURL(userID); | 272 | string invURL = GetInventoryServiceURL(userID); |
273 | 273 | ||
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
281 | 281 | ||
282 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 282 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) |
283 | { | 283 | { |
284 | m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderContent " + folderID); | 284 | //m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderContent " + folderID); |
285 | 285 | ||
286 | string invURL = GetInventoryServiceURL(userID); | 286 | string invURL = GetInventoryServiceURL(userID); |
287 | 287 | ||
@@ -296,7 +296,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
296 | 296 | ||
297 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) | 297 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) |
298 | { | 298 | { |
299 | m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderItems " + folderID); | 299 | //m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolderItems " + folderID); |
300 | 300 | ||
301 | string invURL = GetInventoryServiceURL(userID); | 301 | string invURL = GetInventoryServiceURL(userID); |
302 | 302 | ||
@@ -314,7 +314,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
314 | if (folder == null) | 314 | if (folder == null) |
315 | return false; | 315 | return false; |
316 | 316 | ||
317 | m_log.Debug("[HG INVENTORY CONNECTOR]: AddFolder " + folder.ID); | 317 | //m_log.Debug("[HG INVENTORY CONNECTOR]: AddFolder " + folder.ID); |
318 | 318 | ||
319 | string invURL = GetInventoryServiceURL(folder.Owner); | 319 | string invURL = GetInventoryServiceURL(folder.Owner); |
320 | 320 | ||
@@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
331 | if (folder == null) | 331 | if (folder == null) |
332 | return false; | 332 | return false; |
333 | 333 | ||
334 | m_log.Debug("[HG INVENTORY CONNECTOR]: UpdateFolder " + folder.ID); | 334 | //m_log.Debug("[HG INVENTORY CONNECTOR]: UpdateFolder " + folder.ID); |
335 | 335 | ||
336 | string invURL = GetInventoryServiceURL(folder.Owner); | 336 | string invURL = GetInventoryServiceURL(folder.Owner); |
337 | 337 | ||
@@ -350,7 +350,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
350 | if (folderIDs.Count == 0) | 350 | if (folderIDs.Count == 0) |
351 | return false; | 351 | return false; |
352 | 352 | ||
353 | m_log.Debug("[HG INVENTORY CONNECTOR]: DeleteFolders for " + ownerID); | 353 | //m_log.Debug("[HG INVENTORY CONNECTOR]: DeleteFolders for " + ownerID); |
354 | 354 | ||
355 | string invURL = GetInventoryServiceURL(ownerID); | 355 | string invURL = GetInventoryServiceURL(ownerID); |
356 | 356 | ||
@@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
367 | if (folder == null) | 367 | if (folder == null) |
368 | return false; | 368 | return false; |
369 | 369 | ||
370 | m_log.Debug("[HG INVENTORY CONNECTOR]: MoveFolder for " + folder.Owner); | 370 | //m_log.Debug("[HG INVENTORY CONNECTOR]: MoveFolder for " + folder.Owner); |
371 | 371 | ||
372 | string invURL = GetInventoryServiceURL(folder.Owner); | 372 | string invURL = GetInventoryServiceURL(folder.Owner); |
373 | 373 | ||
@@ -384,7 +384,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
384 | if (folder == null) | 384 | if (folder == null) |
385 | return false; | 385 | return false; |
386 | 386 | ||
387 | m_log.Debug("[HG INVENTORY CONNECTOR]: PurgeFolder for " + folder.Owner); | 387 | //m_log.Debug("[HG INVENTORY CONNECTOR]: PurgeFolder for " + folder.Owner); |
388 | 388 | ||
389 | string invURL = GetInventoryServiceURL(folder.Owner); | 389 | string invURL = GetInventoryServiceURL(folder.Owner); |
390 | 390 | ||
@@ -401,7 +401,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
401 | if (item == null) | 401 | if (item == null) |
402 | return false; | 402 | return false; |
403 | 403 | ||
404 | m_log.Debug("[HG INVENTORY CONNECTOR]: AddItem " + item.ID); | 404 | //m_log.Debug("[HG INVENTORY CONNECTOR]: AddItem " + item.ID); |
405 | 405 | ||
406 | string invURL = GetInventoryServiceURL(item.Owner); | 406 | string invURL = GetInventoryServiceURL(item.Owner); |
407 | 407 | ||
@@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
418 | if (item == null) | 418 | if (item == null) |
419 | return false; | 419 | return false; |
420 | 420 | ||
421 | m_log.Debug("[HG INVENTORY CONNECTOR]: UpdateItem " + item.ID); | 421 | //m_log.Debug("[HG INVENTORY CONNECTOR]: UpdateItem " + item.ID); |
422 | 422 | ||
423 | string invURL = GetInventoryServiceURL(item.Owner); | 423 | string invURL = GetInventoryServiceURL(item.Owner); |
424 | 424 | ||
@@ -437,7 +437,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
437 | if (items.Count == 0) | 437 | if (items.Count == 0) |
438 | return true; | 438 | return true; |
439 | 439 | ||
440 | m_log.Debug("[HG INVENTORY CONNECTOR]: MoveItems for " + ownerID); | 440 | //m_log.Debug("[HG INVENTORY CONNECTOR]: MoveItems for " + ownerID); |
441 | 441 | ||
442 | string invURL = GetInventoryServiceURL(ownerID); | 442 | string invURL = GetInventoryServiceURL(ownerID); |
443 | 443 | ||
@@ -451,15 +451,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
451 | 451 | ||
452 | public bool DeleteItems(UUID ownerID, List<UUID> itemIDs) | 452 | public bool DeleteItems(UUID ownerID, List<UUID> itemIDs) |
453 | { | 453 | { |
454 | m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Delete {0} items for user {1}", itemIDs.Count, ownerID); | 454 | //m_log.DebugFormat("[HG INVENTORY CONNECTOR]: Delete {0} items for user {1}", itemIDs.Count, ownerID); |
455 | 455 | ||
456 | if (itemIDs == null) | 456 | if (itemIDs == null) |
457 | return false; | 457 | return false; |
458 | if (itemIDs.Count == 0) | 458 | if (itemIDs.Count == 0) |
459 | return true; | 459 | return true; |
460 | 460 | ||
461 | m_log.Debug("[HG INVENTORY CONNECTOR]: DeleteItems for " + ownerID); | ||
462 | |||
463 | string invURL = GetInventoryServiceURL(ownerID); | 461 | string invURL = GetInventoryServiceURL(ownerID); |
464 | 462 | ||
465 | if (invURL == null) // not there, forward to local inventory connector to resolve | 463 | if (invURL == null) // not there, forward to local inventory connector to resolve |
@@ -474,7 +472,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
474 | { | 472 | { |
475 | if (item == null) | 473 | if (item == null) |
476 | return null; | 474 | return null; |
477 | m_log.Debug("[HG INVENTORY CONNECTOR]: GetItem " + item.ID); | 475 | //m_log.Debug("[HG INVENTORY CONNECTOR]: GetItem " + item.ID); |
478 | 476 | ||
479 | string invURL = GetInventoryServiceURL(item.Owner); | 477 | string invURL = GetInventoryServiceURL(item.Owner); |
480 | 478 | ||
@@ -491,7 +489,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
491 | if (folder == null) | 489 | if (folder == null) |
492 | return null; | 490 | return null; |
493 | 491 | ||
494 | m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolder " + folder.ID); | 492 | //m_log.Debug("[HG INVENTORY CONNECTOR]: GetFolder " + folder.ID); |
495 | 493 | ||
496 | string invURL = GetInventoryServiceURL(folder.Owner); | 494 | string invURL = GetInventoryServiceURL(folder.Owner); |
497 | 495 | ||
@@ -515,7 +513,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
515 | 513 | ||
516 | public int GetAssetPermissions(UUID userID, UUID assetID) | 514 | public int GetAssetPermissions(UUID userID, UUID assetID) |
517 | { | 515 | { |
518 | m_log.Debug("[HG INVENTORY CONNECTOR]: GetAssetPermissions " + assetID); | 516 | //m_log.Debug("[HG INVENTORY CONNECTOR]: GetAssetPermissions " + assetID); |
519 | 517 | ||
520 | string invURL = GetInventoryServiceURL(userID); | 518 | string invURL = GetInventoryServiceURL(userID); |
521 | 519 | ||