diff options
author | Justin Clarke Casey | 2008-03-30 00:45:04 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-30 00:45:04 +0000 |
commit | 2fddd775f48d9261772f804f0396bb24768afae7 (patch) | |
tree | 6bddde4283c587e4a1a1ec9b9ec249d3fc02c4f0 /OpenSim/Framework/Communications | |
parent | * Refactor: Remove unused inventory methods, some of which weren't properly i... (diff) | |
download | opensim-SC_OLD-2fddd775f48d9261772f804f0396bb24768afae7.zip opensim-SC_OLD-2fddd775f48d9261772f804f0396bb24768afae7.tar.gz opensim-SC_OLD-2fddd775f48d9261772f804f0396bb24768afae7.tar.bz2 opensim-SC_OLD-2fddd775f48d9261772f804f0396bb24768afae7.tar.xz |
* Stop the grid inventory service sending all folder and item details twice
* This change will have no functional impact - we were already filtering out the dupes on the other end.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/InventoryServiceBase.cs | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 719e0d6..a0228e8 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -75,42 +75,11 @@ namespace OpenSim.Framework.Communications | |||
75 | #endregion | 75 | #endregion |
76 | 76 | ||
77 | #region IInventoryServices methods | 77 | #region IInventoryServices methods |
78 | |||
79 | /// <summary> | ||
80 | /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree) | ||
81 | /// for the given user. | ||
82 | /// </summary> | ||
83 | /// <param name="userID"></param> | ||
84 | /// <returns></returns> | ||
85 | public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID) | ||
86 | { | ||
87 | List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>(); | ||
88 | InventoryFolderBase rootFolder = null; | ||
89 | |||
90 | foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) | ||
91 | { | ||
92 | rootFolder = plugin.Value.getUserRootFolder(userID); | ||
93 | if (rootFolder != null) | ||
94 | { | ||
95 | m_log.Info( | ||
96 | "[INVENTORY]: Found root folder for user with ID " + userID + ". Retrieving inventory contents."); | ||
97 | |||
98 | inventoryList = plugin.Value.getInventoryFolders(rootFolder.folderID); | ||
99 | inventoryList.Insert(0, rootFolder); | ||
100 | return inventoryList; | ||
101 | } | ||
102 | } | ||
103 | |||
104 | m_log.Warn( | ||
105 | "[INVENTORY]: Could not find a root folder belonging to user with ID " + userID); | ||
106 | |||
107 | return inventoryList; | ||
108 | } | ||
109 | 78 | ||
110 | // See IInventoryServices | 79 | // See IInventoryServices |
111 | public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId) | 80 | public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId) |
112 | { | 81 | { |
113 | m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId); | 82 | //m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId); |
114 | 83 | ||
115 | List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>(); | 84 | List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>(); |
116 | 85 | ||