diff options
| author | Melanie | 2009-10-07 05:19:20 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-07 05:19:20 +0100 |
| commit | a52f6c56b152ad2835befd7116980941d7653c27 (patch) | |
| tree | 9931fa5c777239725ac28493688d687bcb38ec24 /OpenSim | |
| parent | replace LLClientView with proper version (diff) | |
| parent | A small change in FetchInventoryDescendantsCAPS. (diff) | |
| download | opensim-SC-a52f6c56b152ad2835befd7116980941d7653c27.zip opensim-SC-a52f6c56b152ad2835befd7116980941d7653c27.tar.gz opensim-SC-a52f6c56b152ad2835befd7116980941d7653c27.tar.bz2 opensim-SC-a52f6c56b152ad2835befd7116980941d7653c27.tar.xz | |
Merge branch 'master' into htb-throttle
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index f6d8eac..4ae4dc3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
| @@ -497,10 +497,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 497 | return ret; | 497 | return ret; |
| 498 | } | 498 | } |
| 499 | 499 | ||
| 500 | InventoryCollection contents = InventoryService.GetFolderContent(agentID, folderID); | 500 | InventoryCollection contents = new InventoryCollection(); |
| 501 | 501 | ||
| 502 | if (folderID != UUID.Zero) | 502 | if (folderID != UUID.Zero) |
| 503 | { | 503 | { |
| 504 | contents = InventoryService.GetFolderContent(agentID, folderID); | ||
| 504 | InventoryFolderBase containingFolder = new InventoryFolderBase(); | 505 | InventoryFolderBase containingFolder = new InventoryFolderBase(); |
| 505 | containingFolder.ID = folderID; | 506 | containingFolder.ID = folderID; |
| 506 | containingFolder.Owner = agentID; | 507 | containingFolder.Owner = agentID; |