diff options
author | Justin Clarke Casey | 2008-04-23 22:13:57 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-23 22:13:57 +0000 |
commit | 40176c12f94044527e82972cbb72cce8caa5ce2b (patch) | |
tree | 6d917c2688a039bcc1b64b9699808f62dce4edec /OpenSim/Region | |
parent | * Fixes lsl scripts with no state_entry event at all (diff) | |
download | opensim-SC-40176c12f94044527e82972cbb72cce8caa5ce2b.zip opensim-SC-40176c12f94044527e82972cbb72cce8caa5ce2b.tar.gz opensim-SC-40176c12f94044527e82972cbb72cce8caa5ce2b.tar.bz2 opensim-SC-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/Region')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 8c27cb1..65f3ee3 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -53,7 +53,11 @@ namespace OpenSim.Region.Communications.OGS1 | |||
53 | 53 | ||
54 | #region IInventoryServices Members | 54 | #region IInventoryServices Members |
55 | 55 | ||
56 | // See IInventoryServices | 56 | /// <summary> |
57 | /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> | ||
58 | /// </summary> | ||
59 | /// <param name="userID"></param> | ||
60 | /// <param name="callback"></param> | ||
57 | public void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) | 61 | public void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) |
58 | { | 62 | { |
59 | if (!m_RequestingInventory.ContainsKey(userID)) | 63 | if (!m_RequestingInventory.ContainsKey(userID)) |
@@ -148,6 +152,11 @@ namespace OpenSim.Region.Communications.OGS1 | |||
148 | } | 152 | } |
149 | } | 153 | } |
150 | 154 | ||
155 | /// <summary> | ||
156 | /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> | ||
157 | /// </summary> | ||
158 | /// <param name="userID"></param> | ||
159 | /// <param name="folder"></param> | ||
151 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder) | 160 | public void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder) |
152 | { | 161 | { |
153 | try | 162 | try |
@@ -162,6 +171,11 @@ namespace OpenSim.Region.Communications.OGS1 | |||
162 | } | 171 | } |
163 | } | 172 | } |
164 | 173 | ||
174 | /// <summary> | ||
175 | /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> | ||
176 | /// </summary> | ||
177 | /// <param name="userID"></param> | ||
178 | /// <param name="folder"></param> | ||
165 | public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder) | 179 | public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder) |
166 | { | 180 | { |
167 | try | 181 | try |
@@ -181,11 +195,26 @@ namespace OpenSim.Region.Communications.OGS1 | |||
181 | /// </summary> | 195 | /// </summary> |
182 | /// <param name="userID"></param> | 196 | /// <param name="userID"></param> |
183 | /// <param name="folder"></param> | 197 | /// <param name="folder"></param> |
198 | /// <returns></returns> | ||
184 | public void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder) | 199 | public void PurgeInventoryFolder(LLUUID userID, InventoryFolderBase folder) |
185 | { | 200 | { |
186 | // XXX No implementation yet (temporarily)! | 201 | try |
202 | { | ||
203 | SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>( | ||
204 | "POST", _inventoryServerUrl + "/PurgeFolder/", folder); | ||
205 | } | ||
206 | catch (WebException e) | ||
207 | { | ||
208 | m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", | ||
209 | e.Source, e.Message); | ||
210 | } | ||
187 | } | 211 | } |
188 | 212 | ||
213 | /// <summary> | ||
214 | /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> | ||
215 | /// </summary> | ||
216 | /// <param name="userID"></param> | ||
217 | /// <param name="folder"></param> | ||
189 | public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) | 218 | public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item) |
190 | { | 219 | { |
191 | try | 220 | try |
@@ -200,6 +229,11 @@ namespace OpenSim.Region.Communications.OGS1 | |||
200 | } | 229 | } |
201 | } | 230 | } |
202 | 231 | ||
232 | /// <summary> | ||
233 | /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> | ||
234 | /// </summary> | ||
235 | /// <param name="userID"></param> | ||
236 | /// <param name="folder"></param> | ||
203 | public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) | 237 | public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item) |
204 | { | 238 | { |
205 | try | 239 | try |