1 files changed, 10 insertions, 2 deletions

diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
index 885cffc..a212614 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
@@ -35,6 +35,9 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Console;
+
+using InventoryCategory = OpenSim.Framework.Data.InventoryCategory;
 
 namespace OpenSim.Framework.Communications.Caches
 {
@@ -60,7 +63,7 @@ namespace OpenSim.Framework.Communications.Caches
         }
 
         // Methods
-        public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type)
+        public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type, InventoryCategory category)
         {
             InventoryFolder subFold = new InventoryFolder();
             subFold.name = folderName;
@@ -68,7 +71,12 @@ namespace OpenSim.Framework.Communications.Caches
             subFold.type = (short) type;
             subFold.parentID = this.folderID;
             subFold.agentID = this.agentID;
-            this.SubFolders.Add(subFold.folderID, subFold);
+            subFold.category = category;
+            if (!SubFolders.ContainsKey(subFold.folderID))
+                this.SubFolders.Add(subFold.folderID, subFold);
+            else
+                MainLog.Instance.Warn("INVENTORYCACHE", "Attempt to create a duplicate folder {0} {1}", folderName, folderID);
+
             return subFold;
         }