aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-23 22:13:57 +0000
committerJustin Clarke Casey2008-04-23 22:13:57 +0000
commit40176c12f94044527e82972cbb72cce8caa5ce2b (patch)
tree6d917c2688a039bcc1b64b9699808f62dce4edec /OpenSim/Grid
parent* Fixes lsl scripts with no state_entry event at all (diff)
downloadopensim-SC_OLD-40176c12f94044527e82972cbb72cce8caa5ce2b.zip
opensim-SC_OLD-40176c12f94044527e82972cbb72cce8caa5ce2b.tar.gz
opensim-SC_OLD-40176c12f94044527e82972cbb72cce8caa5ce2b.tar.bz2
opensim-SC_OLD-40176c12f94044527e82972cbb72cce8caa5ce2b.tar.xz
* Implement full grid mode Trash empty
* Now, emptying the trash should remove folders and the items they contain as well as items which were not in a subfolder. * This will only work once both the region and grid servers have reached this revision. * You may also need to clear your cache before this will work * Refactoring to follow.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs24
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs4
2 files changed, 19 insertions, 9 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 016ecff..efa6a6e 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -198,6 +198,11 @@ namespace OpenSim.Grid.InventoryServer
198 { 198 {
199 MoveFolder(folder); 199 MoveFolder(folder);
200 } 200 }
201
202 public override void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder)
203 {
204 PurgeFolder(folder);
205 }
201 206
202 public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) 207 public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
203 { 208 {
@@ -207,7 +212,8 @@ namespace OpenSim.Grid.InventoryServer
207 public bool AddInventoryFolder(InventoryFolderBase folder) 212 public bool AddInventoryFolder(InventoryFolderBase folder)
208 { 213 {
209 // Right now, this actions act more like an update/insert combination than a simple create. 214 // Right now, this actions act more like an update/insert combination than a simple create.
210 m_log.InfoFormat("[GRID AGENT INVENTORY]: Creating folder {0} {1} in folder {2}", folder.Name, folder.ID, folder.ParentID); 215 m_log.InfoFormat(
216 "[GRID AGENT INVENTORY]: Creating folder {0} {1} in folder {2}", folder.Name, folder.ID, folder.ParentID);
211 217
212 AddNewInventoryFolder(folder.Owner, folder); 218 AddNewInventoryFolder(folder.Owner, folder);
213 return true; 219 return true;
@@ -215,20 +221,20 @@ namespace OpenSim.Grid.InventoryServer
215 221
216 public bool MoveInventoryFolder(InventoryFolderBase folder) 222 public bool MoveInventoryFolder(InventoryFolderBase folder)
217 { 223 {
218 m_log.InfoFormat("[GRID AGENT INVENTORY]: Moving folder {0} {1} to folder {2}", folder.Name, folder.ID, folder.ParentID); 224 m_log.InfoFormat(
225 "[GRID AGENT INVENTORY]: Moving folder {0} {1} to folder {2}", folder.Name, folder.ID, folder.ParentID);
219 226
220 MoveExistingInventoryFolder(folder); 227 MoveExistingInventoryFolder(folder);
221 return true; 228 return true;
222 } 229 }
223 230
224 /// <summary> 231 public bool PurgeInventoryFolder(InventoryFolderBase folder)
225 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
226 /// </summary>
227 /// <param name="userID"></param>
228 /// <param name="folder"></param>
229 public override void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder)
230 { 232 {
231 // XXX No implementation yet (temporarily)! 233 m_log.InfoFormat(
234 "[GRID AGENT INVENTORY]: Purging folder {0} {1} of its contents", folder.Name, folder.ID);
235
236 PurgeInventoryFolder(folder.Owner, folder);
237 return true;
232 } 238 }
233 239
234 public bool AddInventoryItem(InventoryItemBase item) 240 public bool AddInventoryItem(InventoryItemBase item)
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 85d9ba5..870997b 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -100,6 +100,10 @@ namespace OpenSim.Grid.InventoryServer
100 m_httpServer.AddStreamHandler( 100 m_httpServer.AddStreamHandler(
101 new RestDeserialisehandler<InventoryFolderBase, bool>( 101 new RestDeserialisehandler<InventoryFolderBase, bool>(
102 "POST", "/MoveFolder/", m_inventoryService.MoveInventoryFolder)); 102 "POST", "/MoveFolder/", m_inventoryService.MoveInventoryFolder));
103
104 m_httpServer.AddStreamHandler(
105 new RestDeserialisehandler<InventoryFolderBase, bool>(
106 "POST", "/PurgeFolder/", m_inventoryService.PurgeInventoryFolder));
103 107
104 m_httpServer.AddStreamHandler( 108 m_httpServer.AddStreamHandler(
105 new RestDeserialisehandler<InventoryItemBase, bool>( 109 new RestDeserialisehandler<InventoryItemBase, bool>(