diff options
author | lbsa71 | 2007-09-27 14:57:43 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-27 14:57:43 +0000 |
commit | 863195612bdef56165f2b4354bab280c371618b9 (patch) | |
tree | 63cec15a6c0338a8777640ed13fd7c3ce05eeba7 /OpenSim/Framework/Communications/Cache/InventoryFolder.cs | |
parent | revert change to libsecondlife.dll.config which breaks Linux (diff) | |
download | opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.zip opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.gz opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.bz2 opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.xz |
Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/InventoryFolder.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/InventoryFolder.cs | 12 |
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; | |||
35 | using OpenSim.Framework.Data; | 35 | using OpenSim.Framework.Data; |
36 | using OpenSim.Framework.Types; | 36 | using OpenSim.Framework.Types; |
37 | using OpenSim.Framework.Utilities; | 37 | using OpenSim.Framework.Utilities; |
38 | using OpenSim.Framework.Console; | ||
39 | |||
40 | using InventoryCategory = OpenSim.Framework.Data.InventoryCategory; | ||
41 | 38 | ||
42 | namespace OpenSim.Framework.Communications.Caches | 39 | namespace 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 | ||