diff options
| author | MW | 2007-12-01 20:57:14 +0000 |
|---|---|---|
| committer | MW | 2007-12-01 20:57:14 +0000 |
| commit | 4dee53c7fb476b0503b8443b2dba1eb868a56815 (patch) | |
| tree | d78634405ab06746ec7b99b57086268ab015bf81 | |
| parent | added the mysql table files for inventory. Thanks nebadon. (diff) | |
| download | opensim-SC-4dee53c7fb476b0503b8443b2dba1eb868a56815.zip opensim-SC-4dee53c7fb476b0503b8443b2dba1eb868a56815.tar.gz opensim-SC-4dee53c7fb476b0503b8443b2dba1eb868a56815.tar.bz2 opensim-SC-4dee53c7fb476b0503b8443b2dba1eb868a56815.tar.xz | |
Attempt to fix mantis issue # 73
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/InventoryFolder.cs | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs index 6161c5a..fd029cd 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs | |||
| @@ -60,14 +60,18 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 60 | // Methods | 60 | // Methods |
| 61 | public InventoryFolderImpl CreateNewSubFolder(LLUUID folderID, string folderName, ushort type) | 61 | public InventoryFolderImpl CreateNewSubFolder(LLUUID folderID, string folderName, ushort type) |
| 62 | { | 62 | { |
| 63 | InventoryFolderImpl subFold = new InventoryFolderImpl(); | 63 | if (!SubFolders.ContainsKey(folderID)) |
| 64 | subFold.name = folderName; | 64 | { |
| 65 | subFold.folderID = folderID; | 65 | InventoryFolderImpl subFold = new InventoryFolderImpl(); |
| 66 | subFold.type = (short) type; | 66 | subFold.name = folderName; |
| 67 | subFold.parentID = this.folderID; | 67 | subFold.folderID = folderID; |
| 68 | subFold.agentID = agentID; | 68 | subFold.type = (short)type; |
| 69 | SubFolders.Add(subFold.folderID, subFold); | 69 | subFold.parentID = this.folderID; |
| 70 | return subFold; | 70 | subFold.agentID = agentID; |
| 71 | SubFolders.Add(subFold.folderID, subFold); | ||
| 72 | return subFold; | ||
| 73 | } | ||
| 74 | return null; | ||
| 71 | } | 75 | } |
| 72 | 76 | ||
| 73 | public InventoryItemBase HasItem(LLUUID itemID) | 77 | public InventoryItemBase HasItem(LLUUID itemID) |