diff options
| author | Melanie | 2010-04-28 19:38:29 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-28 19:38:29 +0100 |
| commit | aba5db9ed4e941f464d19a20074cab1d0bc726d0 (patch) | |
| tree | 45adf5185df75b3b361ab1961ef6e03d67e9b7cc /OpenSim/Data/MySQL/MySQLInventoryData.cs | |
| parent | Commented verbose debug messages from XInventory handler. (diff) | |
| parent | Refactoring in Migration.cs: "using()" instead of explicit Dispose() (diff) | |
| download | opensim-SC-aba5db9ed4e941f464d19a20074cab1d0bc726d0.zip opensim-SC-aba5db9ed4e941f464d19a20074cab1d0bc726d0.tar.gz opensim-SC-aba5db9ed4e941f464d19a20074cab1d0bc726d0.tar.bz2 opensim-SC-aba5db9ed4e941f464d19a20074cab1d0bc726d0.tar.xz | |
Merge branch 'minor-stuff'
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 192deb2..e0e9b9c 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
| @@ -145,7 +145,7 @@ namespace OpenSim.Data.MySQL | |||
| 145 | /// <summary> | 145 | /// <summary> |
| 146 | /// Returns a list of the root folders within a users inventory | 146 | /// Returns a list of the root folders within a users inventory |
| 147 | /// </summary> | 147 | /// </summary> |
| 148 | /// <param name="user">The user whos inventory is to be searched</param> | 148 | /// <param name="user">The user whose inventory is to be searched</param> |
| 149 | /// <returns>A list of folder objects</returns> | 149 | /// <returns>A list of folder objects</returns> |
| 150 | public List<InventoryFolderBase> getUserRootFolders(UUID user) | 150 | public List<InventoryFolderBase> getUserRootFolders(UUID user) |
| 151 | { | 151 | { |
| @@ -284,7 +284,7 @@ namespace OpenSim.Data.MySQL | |||
| 284 | { | 284 | { |
| 285 | InventoryItemBase item = new InventoryItemBase(); | 285 | InventoryItemBase item = new InventoryItemBase(); |
| 286 | 286 | ||
| 287 | // TODO: this is to handle a case where NULLs creep in there, which we are not sure is indemic to the system, or legacy. It would be nice to live fix these. | 287 | // TODO: this is to handle a case where NULLs creep in there, which we are not sure is endemic to the system, or legacy. It would be nice to live fix these. |
| 288 | if (reader["creatorID"] == null) | 288 | if (reader["creatorID"] == null) |
| 289 | { | 289 | { |
| 290 | item.CreatorId = UUID.Zero.ToString(); | 290 | item.CreatorId = UUID.Zero.ToString(); |