aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/InventoryService/InventoryService.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/InventoryService/InventoryService.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_OLD-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.zip
opensim-SC_OLD-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.tar.gz
opensim-SC_OLD-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.tar.bz2
opensim-SC_OLD-5c2bf97bf2fe5dfe69b98bf50df2d994ac4c23bf.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/InventoryService/InventoryService.cs')
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index f04754b..b98e256 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -232,7 +232,7 @@ namespace OpenSim.Services.InventoryService
232 m_log.WarnFormat("[INVENTORY SERVICE]: User {0} inventory not available", userID); 232 m_log.WarnFormat("[INVENTORY SERVICE]: User {0} inventory not available", userID);
233 } 233 }
234 234
235 callback.BeginInvoke(folders, items, null, null); 235 Util.FireAndForget(delegate { callback(folders, items); });
236 } 236 }
237 237
238 public InventoryCollection GetFolderContent(UUID userID, UUID folderID) 238 public InventoryCollection GetFolderContent(UUID userID, UUID folderID)