diff options
author | Justin Clarke Casey | 2008-11-28 19:39:46 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-28 19:39:46 +0000 |
commit | 71e05a5707f1eaed098592dc1c3feb3389731634 (patch) | |
tree | 40ec2c07c2dbca6ff32a27c3e216ece22746f30d /OpenSim/Framework | |
parent | * test: Separate out async deletion methods to test delete and take copy sepa... (diff) | |
download | opensim-SC-71e05a5707f1eaed098592dc1c3feb3389731634.zip opensim-SC-71e05a5707f1eaed098592dc1c3feb3389731634.tar.gz opensim-SC-71e05a5707f1eaed098592dc1c3feb3389731634.tar.bz2 opensim-SC-71e05a5707f1eaed098592dc1c3feb3389731634.tar.xz |
* test: Add a wodge of code in order to be able to slightly extend a test to deliver a taken object to a user inventory folder without throwing an exception
* test doesn't actually double check for the presence of the item yet
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/IInventoryData.cs | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index d242cb3..4212fbc 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -214,7 +214,6 @@ namespace OpenSim.Framework.Communications.Cache | |||
214 | /// <param name="inventoryCollection"></param> | 214 | /// <param name="inventoryCollection"></param> |
215 | public void InventoryReceive(ICollection<InventoryFolderImpl> folders, ICollection<InventoryItemBase> items) | 215 | public void InventoryReceive(ICollection<InventoryFolderImpl> folders, ICollection<InventoryItemBase> items) |
216 | { | 216 | { |
217 | |||
218 | // FIXME: Exceptions thrown upwards never appear on the console. Could fix further up if these | 217 | // FIXME: Exceptions thrown upwards never appear on the console. Could fix further up if these |
219 | // are simply being swallowed | 218 | // are simply being swallowed |
220 | 219 | ||
diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Framework/IInventoryData.cs index e42e50d..8ea1fb3 100644 --- a/OpenSim/Framework/IInventoryData.cs +++ b/OpenSim/Framework/IInventoryData.cs | |||
@@ -41,8 +41,7 @@ namespace OpenSim.Framework | |||
41 | void Initialise(string connect); | 41 | void Initialise(string connect); |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Returns all child folders in the hierarchy from the parent folder and down. | 44 | /// Returns all descendent folders of this folder. Does not return the parent folder itself. |
45 | /// Does not return the parent folder itself. | ||
46 | /// </summary> | 45 | /// </summary> |
47 | /// <param name="parentID">The folder to get subfolders for</param> | 46 | /// <param name="parentID">The folder to get subfolders for</param> |
48 | /// <returns>A list of inventory folders</returns> | 47 | /// <returns>A list of inventory folders</returns> |