diff options
author | Oren Hurvitz | 2014-04-23 08:17:25 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-23 14:38:33 +0100 |
commit | 018832522c3c5e37f027bade05c93b88d6ca3827 (patch) | |
tree | ff5b67195e19263505140c121920e6a6be3b4ddc /OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |
parent | Eliminated 'Obsolete' warning: don't call do-nothing function SetPreviousAppe... (diff) | |
download | opensim-SC_OLD-018832522c3c5e37f027bade05c93b88d6ca3827.zip opensim-SC_OLD-018832522c3c5e37f027bade05c93b88d6ca3827.tar.gz opensim-SC_OLD-018832522c3c5e37f027bade05c93b88d6ca3827.tar.bz2 opensim-SC_OLD-018832522c3c5e37f027bade05c93b88d6ca3827.tar.xz |
Removed GetUserInventory(). It wasn't being used, and was creating warnings because it's Obsolete.
Diffstat (limited to 'OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs index 36d4ae2..d258293 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |||
@@ -484,45 +484,6 @@ namespace OpenSim.Services.Connectors | |||
484 | return 0; | 484 | return 0; |
485 | } | 485 | } |
486 | 486 | ||
487 | public InventoryCollection GetUserInventory(UUID principalID) | ||
488 | { | ||
489 | InventoryCollection inventory = new InventoryCollection(); | ||
490 | inventory.Folders = new List<InventoryFolderBase>(); | ||
491 | inventory.Items = new List<InventoryItemBase>(); | ||
492 | inventory.UserID = principalID; | ||
493 | |||
494 | try | ||
495 | { | ||
496 | Dictionary<string, object> ret = MakeRequest("GETUSERINVENTORY", | ||
497 | new Dictionary<string, object> { | ||
498 | { "PRINCIPAL", principalID.ToString() } | ||
499 | }); | ||
500 | |||
501 | if (!CheckReturn(ret)) | ||
502 | return null; | ||
503 | |||
504 | Dictionary<string, object> folders = | ||
505 | (Dictionary<string, object>)ret["FOLDERS"]; | ||
506 | Dictionary<string, object> items = | ||
507 | (Dictionary<string, object>)ret["ITEMS"]; | ||
508 | |||
509 | foreach (Object o in folders.Values) // getting the values directly, we don't care about the keys folder_i | ||
510 | inventory.Folders.Add(BuildFolder((Dictionary<string, object>)o)); | ||
511 | foreach (Object o in items.Values) // getting the values directly, we don't care about the keys item_i | ||
512 | inventory.Items.Add(BuildItem((Dictionary<string, object>)o)); | ||
513 | } | ||
514 | catch (Exception e) | ||
515 | { | ||
516 | m_log.Error("[XINVENTORY SERVICES CONNECTOR]: Exception in GetUserInventory: ", e); | ||
517 | } | ||
518 | |||
519 | return inventory; | ||
520 | } | ||
521 | |||
522 | public void GetUserInventory(UUID principalID, InventoryReceiptCallback callback) | ||
523 | { | ||
524 | } | ||
525 | |||
526 | public bool HasInventoryForUser(UUID principalID) | 487 | public bool HasInventoryForUser(UUID principalID) |
527 | { | 488 | { |
528 | return false; | 489 | return false; |
@@ -607,4 +568,4 @@ namespace OpenSim.Services.Connectors | |||
607 | return item; | 568 | return item; |
608 | } | 569 | } |
609 | } | 570 | } |
610 | } \ No newline at end of file | 571 | } |