diff options
author | diva | 2009-06-08 03:09:24 +0000 |
---|---|---|
committer | diva | 2009-06-08 03:09:24 +0000 |
commit | 16d50032741925c34176da0cca153e7b7de6e325 (patch) | |
tree | a6dca99e7ce2537dbe45a2c759fd6941890f92dd /OpenSim/Region | |
parent | First draft of inventory service connectors, and service implementation. No h... (diff) | |
download | opensim-SC_OLD-16d50032741925c34176da0cca153e7b7de6e325.zip opensim-SC_OLD-16d50032741925c34176da0cca153e7b7de6e325.tar.gz opensim-SC_OLD-16d50032741925c34176da0cca153e7b7de6e325.tar.bz2 opensim-SC_OLD-16d50032741925c34176da0cca153e7b7de6e325.tar.xz |
Added more functions to IInventoryService. Unsure about whether all of these are really necessary.
Diffstat (limited to '')
3 files changed, 83 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs index f4cd269..3a0011f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs | |||
@@ -159,6 +159,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
159 | 159 | ||
160 | #region IInventoryService | 160 | #region IInventoryService |
161 | 161 | ||
162 | public bool CreateUserInventory(UUID userID) | ||
163 | { | ||
164 | if (IsLocalGridUser(userID)) | ||
165 | return m_GridService.CreateUserInventory(userID); | ||
166 | else | ||
167 | return false; | ||
168 | } | ||
169 | |||
170 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) | ||
171 | { | ||
172 | return new List<InventoryFolderBase>(); | ||
173 | } | ||
174 | |||
175 | public InventoryCollection GetUserInventory(UUID userID) | ||
176 | { | ||
177 | if (IsLocalGridUser(userID)) | ||
178 | return m_GridService.GetUserInventory(userID); | ||
179 | else | ||
180 | return null; | ||
181 | } | ||
182 | |||
162 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | 183 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) |
163 | { | 184 | { |
164 | if (IsLocalGridUser(userID)) | 185 | if (IsLocalGridUser(userID)) |
@@ -171,6 +192,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
171 | } | 192 | } |
172 | } | 193 | } |
173 | 194 | ||
195 | public List<InventoryItemBase> GetFolderItems(UUID folderID) | ||
196 | { | ||
197 | return new List<InventoryItemBase>(); | ||
198 | } | ||
199 | |||
174 | public bool AddFolder(InventoryFolderBase folder) | 200 | public bool AddFolder(InventoryFolderBase folder) |
175 | { | 201 | { |
176 | if (folder == null) | 202 | if (folder == null) |
@@ -316,6 +342,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
316 | return null; | 342 | return null; |
317 | } | 343 | } |
318 | 344 | ||
345 | public List<InventoryItemBase> GetActiveGestures(UUID userId) | ||
346 | { | ||
347 | return new List<InventoryItemBase>(); | ||
348 | } | ||
349 | |||
319 | #endregion | 350 | #endregion |
320 | 351 | ||
321 | private UUID GetSessionID(UUID userID) | 352 | private UUID GetSessionID(UUID userID) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs index 3db08eb..c89f295 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -137,11 +137,33 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
137 | 137 | ||
138 | } | 138 | } |
139 | 139 | ||
140 | #region IInventoryService | ||
141 | |||
142 | public bool CreateUserInventory(UUID user) | ||
143 | { | ||
144 | return m_InventoryService.CreateUserInventory(user); | ||
145 | } | ||
146 | |||
147 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) | ||
148 | { | ||
149 | return m_InventoryService.GetInventorySkeleton(userId); | ||
150 | } | ||
151 | |||
152 | public InventoryCollection GetUserInventory(UUID id) | ||
153 | { | ||
154 | return m_InventoryService.GetUserInventory(id); | ||
155 | } | ||
156 | |||
140 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | 157 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) |
141 | { | 158 | { |
142 | m_InventoryService.GetUserInventory(userID, callback); | 159 | m_InventoryService.GetUserInventory(userID, callback); |
143 | } | 160 | } |
144 | 161 | ||
162 | public List<InventoryItemBase> GetFolderItems(UUID folderID) | ||
163 | { | ||
164 | return m_InventoryService.GetFolderItems(folderID); | ||
165 | } | ||
166 | |||
145 | /// <summary> | 167 | /// <summary> |
146 | /// Add a new folder to the user's inventory | 168 | /// Add a new folder to the user's inventory |
147 | /// </summary> | 169 | /// </summary> |
@@ -242,5 +264,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
242 | return m_InventoryService.RequestRootFolder(userID); | 264 | return m_InventoryService.RequestRootFolder(userID); |
243 | } | 265 | } |
244 | 266 | ||
267 | public List<InventoryItemBase> GetActiveGestures(UUID userId) | ||
268 | { | ||
269 | return m_InventoryService.GetActiveGestures(userId); | ||
270 | } | ||
271 | #endregion IInventoryService | ||
245 | } | 272 | } |
246 | } | 273 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs index ddb6cff..b695fce 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -122,6 +122,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
122 | 122 | ||
123 | #region IInventoryService | 123 | #region IInventoryService |
124 | 124 | ||
125 | public bool CreateUserInventory(UUID user) | ||
126 | { | ||
127 | return false; | ||
128 | } | ||
129 | |||
130 | public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) | ||
131 | { | ||
132 | return new List<InventoryFolderBase>(); | ||
133 | } | ||
134 | |||
135 | public InventoryCollection GetUserInventory(UUID userID) | ||
136 | { | ||
137 | return null; | ||
138 | } | ||
139 | |||
125 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) | 140 | public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) |
126 | { | 141 | { |
127 | UUID sessionID = GetSessionID(userID); | 142 | UUID sessionID = GetSessionID(userID); |
@@ -140,6 +155,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
140 | 155 | ||
141 | } | 156 | } |
142 | 157 | ||
158 | public List<InventoryItemBase> GetFolderItems(UUID folderID) | ||
159 | { | ||
160 | return new List<InventoryItemBase>(); | ||
161 | } | ||
162 | |||
143 | public bool AddFolder(InventoryFolderBase folder) | 163 | public bool AddFolder(InventoryFolderBase folder) |
144 | { | 164 | { |
145 | if (folder == null) | 165 | if (folder == null) |
@@ -231,6 +251,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory | |||
231 | return null; | 251 | return null; |
232 | } | 252 | } |
233 | 253 | ||
254 | public List<InventoryItemBase> GetActiveGestures(UUID userId) | ||
255 | { | ||
256 | return new List<InventoryItemBase>(); | ||
257 | } | ||
258 | |||
234 | #endregion | 259 | #endregion |
235 | 260 | ||
236 | private UUID GetSessionID(UUID userID) | 261 | private UUID GetSessionID(UUID userID) |