diff options
author | Charles Krinke | 2008-06-11 14:02:16 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-11 14:02:16 +0000 |
commit | 7821cca2f5a7c31a41446656f218fdaf450969c0 (patch) | |
tree | a5ac8102278c6011dd211b372776280c0863cc26 /OpenSim/Framework/Communications | |
parent | Mantis#1528. Thank you kindly, Boscata for: (diff) | |
download | opensim-SC-7821cca2f5a7c31a41446656f218fdaf450969c0.zip opensim-SC-7821cca2f5a7c31a41446656f218fdaf450969c0.tar.gz opensim-SC-7821cca2f5a7c31a41446656f218fdaf450969c0.tar.bz2 opensim-SC-7821cca2f5a7c31a41446656f218fdaf450969c0.tar.xz |
Mantis#1514. Thank you kindly, Boscata for an InventoryServer patch
to allow the InventoryServer to work with MSSQL..
Diffstat (limited to '')
3 files changed, 23 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index b98cec7..d010bd5 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -379,7 +379,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
379 | baseFolder.Type = (short) type; | 379 | baseFolder.Type = (short) type; |
380 | baseFolder.Version = RootFolder.Version; | 380 | baseFolder.Version = RootFolder.Version; |
381 | 381 | ||
382 | m_commsManager.InventoryService.AddFolder(baseFolder); | 382 | m_commsManager.InventoryService.UpdateFolder(baseFolder); |
383 | } | 383 | } |
384 | else | 384 | else |
385 | { | 385 | { |
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs index f7a8857..8dc09bc 100644 --- a/OpenSim/Framework/Communications/IInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInventoryServices.cs | |||
@@ -58,6 +58,13 @@ namespace OpenSim.Framework.Communications | |||
58 | bool AddFolder(InventoryFolderBase folder); | 58 | bool AddFolder(InventoryFolderBase folder); |
59 | 59 | ||
60 | /// <summary> | 60 | /// <summary> |
61 | /// Update a folder in the user's inventory | ||
62 | /// </summary> | ||
63 | /// <param name="folder"></param> | ||
64 | /// <returns>true if the folder was successfully updated</returns> | ||
65 | bool UpdateFolder(InventoryFolderBase folder); | ||
66 | |||
67 | /// <summary> | ||
61 | /// Move an inventory folder to a new location | 68 | /// Move an inventory folder to a new location |
62 | /// </summary> | 69 | /// </summary> |
63 | /// <param name="folder">A folder containing the details of the new location</param> | 70 | /// <param name="folder">A folder containing the details of the new location</param> |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index dffeed3..89ccf93 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -199,6 +199,21 @@ namespace OpenSim.Framework.Communications | |||
199 | } | 199 | } |
200 | 200 | ||
201 | // See IInventoryServices | 201 | // See IInventoryServices |
202 | public bool UpdateFolder(InventoryFolderBase folder) | ||
203 | { | ||
204 | m_log.DebugFormat( | ||
205 | "[AGENT INVENTORY]: Updating folder {0} {1} to folder {2}", folder.Name, folder.ID, folder.ParentID); | ||
206 | |||
207 | foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) | ||
208 | { | ||
209 | plugin.Value.updateInventoryFolder(folder); | ||
210 | } | ||
211 | |||
212 | // FIXME: Should return false on failure | ||
213 | return true; | ||
214 | } | ||
215 | |||
216 | // See IInventoryServices | ||
202 | public bool MoveFolder(InventoryFolderBase folder) | 217 | public bool MoveFolder(InventoryFolderBase folder) |
203 | { | 218 | { |
204 | m_log.DebugFormat( | 219 | m_log.DebugFormat( |