aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2009-09-03 21:04:06 +0100
committerMelanie2009-09-03 21:04:06 +0100
commit5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf (patch)
treee48751a92b2ac8bad613c0a1355a9206fe596fd0 /OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
parentRemove the distinction between password and login key in the authentication (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.zip
opensim-SC-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.tar.gz
opensim-SC-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.tar.bz2
opensim-SC-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index a2261ba..cef678d 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -461,6 +461,8 @@ namespace OpenSim.Services.Connectors
461 461
462 private void MoveItemsCompleted(IAsyncResult iar) 462 private void MoveItemsCompleted(IAsyncResult iar)
463 { 463 {
464 MoveItemsDelegate d = (MoveItemsDelegate)iar.AsyncState;
465 d.EndInvoke(iar);
464 } 466 }
465 467
466 public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID) 468 public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID)