diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-25 16:13:02 -0400 |
| commit | a7917b428a6bc3c9e33da64879b9e473516540a3 (patch) | |
| tree | 2c38d9c33c4977a3d0356912915082a8bd568a23 /OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |
| parent | Patch from jhurliman to HttpServer (diff) | |
| parent | Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using... (diff) | |
| download | opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.zip opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.gz opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.bz2 opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/CachedUserInfo.cs')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index ca641d0..238810a 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
| @@ -653,7 +653,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 653 | 653 | ||
| 654 | if (RootFolder.DeleteItem(item.ID)) | 654 | if (RootFolder.DeleteItem(item.ID)) |
| 655 | { | 655 | { |
| 656 | return m_InventoryService.DeleteItem(item); | 656 | List<UUID> uuids = new List<UUID>(); |
| 657 | uuids.Add(itemID); | ||
| 658 | return m_InventoryService.DeleteItems(this.UserProfile.ID, uuids); | ||
| 657 | } | 659 | } |
| 658 | } | 660 | } |
| 659 | else | 661 | else |