diff options
| author | Justin Clarke Casey | 2008-04-10 16:04:19 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-04-10 16:04:19 +0000 |
| commit | 5ad4c79a4e5e2d6c9ba26034e5b325007f0b6f7a (patch) | |
| tree | 157a5fcd7ca475b0d5c443f84cecef8a9e94a52e /OpenSim/Framework | |
| parent | Thank you Justin for a patch that solves the issue of: When a sensor detects ... (diff) | |
| download | opensim-SC-5ad4c79a4e5e2d6c9ba26034e5b325007f0b6f7a.zip opensim-SC-5ad4c79a4e5e2d6c9ba26034e5b325007f0b6f7a.tar.gz opensim-SC-5ad4c79a4e5e2d6c9ba26034e5b325007f0b6f7a.tar.bz2 opensim-SC-5ad4c79a4e5e2d6c9ba26034e5b325007f0b6f7a.tar.xz | |
* Refactor GetUsersInventory()
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Communications/IInventoryServices.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Framework/Communications/InventoryServiceBase.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs index 966ab75..ecc6c71 100644 --- a/OpenSim/Framework/Communications/IInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInventoryServices.cs | |||
| @@ -85,8 +85,8 @@ namespace OpenSim.Framework.Communications | |||
| 85 | /// Returns a list of all the folders in a given user's inventory. | 85 | /// Returns a list of all the folders in a given user's inventory. |
| 86 | /// </summary> | 86 | /// </summary> |
| 87 | /// <param name="userId"></param> | 87 | /// <param name="userId"></param> |
| 88 | /// <returns>A flat list of the user's inventory folder tree. | 88 | /// <returns>A flat list of the user's inventory folder tree, |
| 89 | /// Null if there is no inventory for this user</returns> | 89 | /// null if there is no inventory for this user</returns> |
| 90 | List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId); | 90 | List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId); |
| 91 | } | 91 | } |
| 92 | } | 92 | } |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index f9a47b1..e50e19e 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
| @@ -141,7 +141,7 @@ namespace OpenSim.Framework.Communications | |||
| 141 | 141 | ||
| 142 | if (null != existingRootFolder) | 142 | if (null != existingRootFolder) |
| 143 | { | 143 | { |
| 144 | m_log.ErrorFormat( | 144 | m_log.WarnFormat( |
| 145 | "[AGENT INVENTORY]: Did not create a new inventory for user {0} since they already have " | 145 | "[AGENT INVENTORY]: Did not create a new inventory for user {0} since they already have " |
| 146 | + "a root inventory folder with id {1}", | 146 | + "a root inventory folder with id {1}", |
| 147 | user, existingRootFolder.ID); | 147 | user, existingRootFolder.ID); |