aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/InventoryFolder.cs')
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolder.cs12
1 files changed, 2 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
index a212614..885cffc 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
@@ -35,9 +35,6 @@ using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Data; 35using OpenSim.Framework.Data;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
38using OpenSim.Framework.Console;
39
40using InventoryCategory = OpenSim.Framework.Data.InventoryCategory;
41 38
42namespace OpenSim.Framework.Communications.Caches 39namespace OpenSim.Framework.Communications.Caches
43{ 40{
@@ -63,7 +60,7 @@ namespace OpenSim.Framework.Communications.Caches
63 } 60 }
64 61
65 // Methods 62 // Methods
66 public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type, InventoryCategory category) 63 public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type)
67 { 64 {
68 InventoryFolder subFold = new InventoryFolder(); 65 InventoryFolder subFold = new InventoryFolder();
69 subFold.name = folderName; 66 subFold.name = folderName;
@@ -71,12 +68,7 @@ namespace OpenSim.Framework.Communications.Caches
71 subFold.type = (short) type; 68 subFold.type = (short) type;
72 subFold.parentID = this.folderID; 69 subFold.parentID = this.folderID;
73 subFold.agentID = this.agentID; 70 subFold.agentID = this.agentID;
74 subFold.category = category; 71 this.SubFolders.Add(subFold.folderID, subFold);
75 if (!SubFolders.ContainsKey(subFold.folderID))
76 this.SubFolders.Add(subFold.folderID, subFold);
77 else
78 MainLog.Instance.Warn("INVENTORYCACHE", "Attempt to create a duplicate folder {0} {1}", folderName, folderID);
79
80 return subFold; 72 return subFold;
81 } 73 }
82 74