diff options
Diffstat (limited to 'OpenSim/Region')
3 files changed, 1 insertions, 30 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index fc5cc6c..df735a9 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs | |||
@@ -42,7 +42,6 @@ namespace OpenSim.Region.Communications.Local | |||
42 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, | 42 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, |
43 | InventoryItemInfo itemCallBack) | 43 | InventoryItemInfo itemCallBack) |
44 | { | 44 | { |
45 | //List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID); | ||
46 | List<InventoryFolderBase> folders = GetInventorySkeleton(userID); | 45 | List<InventoryFolderBase> folders = GetInventorySkeleton(userID); |
47 | 46 | ||
48 | InventoryFolderImpl rootFolder = null; | 47 | InventoryFolderImpl rootFolder = null; |
@@ -101,24 +100,6 @@ namespace OpenSim.Region.Communications.Local | |||
101 | } | 100 | } |
102 | } | 101 | } |
103 | 102 | ||
104 | public override InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName) | ||
105 | { | ||
106 | List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID); | ||
107 | InventoryFolderBase requestedFolder = null; | ||
108 | |||
109 | //need to make sure we send root folder first | ||
110 | foreach (InventoryFolderBase folder in folders) | ||
111 | { | ||
112 | if (folder.name == folderName) | ||
113 | { | ||
114 | requestedFolder = folder; | ||
115 | break; | ||
116 | } | ||
117 | } | ||
118 | |||
119 | return requestedFolder; | ||
120 | } | ||
121 | |||
122 | /// <summary> | 103 | /// <summary> |
123 | /// Send the given inventory folder and its item contents back to the requester. | 104 | /// Send the given inventory folder and its item contents back to the requester. |
124 | /// </summary> | 105 | /// </summary> |
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 6bb505d..3cea82d 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -216,7 +216,7 @@ namespace OpenSim.Region.Communications.Local | |||
216 | protected override InventoryData GetInventorySkeleton(LLUUID userID) | 216 | protected override InventoryData GetInventorySkeleton(LLUUID userID) |
217 | { | 217 | { |
218 | List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID); | 218 | List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID); |
219 | //List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID); | 219 | |
220 | if (folders.Count > 0) | 220 | if (folders.Count > 0) |
221 | { | 221 | { |
222 | LLUUID rootID = LLUUID.Zero; | 222 | LLUUID rootID = LLUUID.Zero; |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index e78fc1a..5c93962 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -208,11 +208,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
208 | return null; | 208 | return null; |
209 | } | 209 | } |
210 | 210 | ||
211 | public virtual InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName) | ||
212 | { | ||
213 | return null; | ||
214 | } | ||
215 | |||
216 | public void CreateNewUserInventory(LLUUID user) | 211 | public void CreateNewUserInventory(LLUUID user) |
217 | { | 212 | { |
218 | } | 213 | } |
@@ -225,11 +220,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
225 | return new List<InventoryFolderBase>(); | 220 | return new List<InventoryFolderBase>(); |
226 | } | 221 | } |
227 | 222 | ||
228 | public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID) | ||
229 | { | ||
230 | return new List<InventoryFolderBase>(); | ||
231 | } | ||
232 | |||
233 | #endregion | 223 | #endregion |
234 | 224 | ||
235 | public class InventoryRequest | 225 | public class InventoryRequest |