aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2009-10-07 05:19:20 +0100
committerMelanie2009-10-07 05:19:20 +0100
commita52f6c56b152ad2835befd7116980941d7653c27 (patch)
tree9931fa5c777239725ac28493688d687bcb38ec24 /OpenSim/Region/Framework/Scenes
parentreplace LLClientView with proper version (diff)
parentA small change in FetchInventoryDescendantsCAPS. (diff)
downloadopensim-SC_OLD-a52f6c56b152ad2835befd7116980941d7653c27.zip
opensim-SC_OLD-a52f6c56b152ad2835befd7116980941d7653c27.tar.gz
opensim-SC_OLD-a52f6c56b152ad2835befd7116980941d7653c27.tar.bz2
opensim-SC_OLD-a52f6c56b152ad2835befd7116980941d7653c27.tar.xz
Merge branch 'master' into htb-throttle
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs3
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;