OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into htb-throttle

prioritization
Melanie 2009-10-07 05:19:20 +01:00
parent d33b6fef2b d344ca932d
commit a52f6c56b1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
View File

@ -497,10 +497,11 @@ namespace OpenSim.Region.Framework.Scenes
return ret; return ret;
} }
InventoryCollection contents = InventoryService.GetFolderContent(agentID, folderID); InventoryCollection contents = new InventoryCollection();
if (folderID != UUID.Zero) if (folderID != UUID.Zero)
{ {
contents = InventoryService.GetFolderContent(agentID, folderID);
InventoryFolderBase containingFolder = new InventoryFolderBase(); InventoryFolderBase containingFolder = new InventoryFolderBase();
containingFolder.ID = folderID; containingFolder.ID = folderID;
containingFolder.Owner = agentID; containingFolder.Owner = agentID;