diff options
| author | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
| commit | 89e79c11335d55ae8131d6fa92218bf387e6c48e (patch) | |
| tree | bb96e1093123b21e41f52e61000398f82f83f23b /OpenSim/Data/MySQL | |
| parent | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy (diff) | |
| parent | Fix some symbol errors (diff) | |
| download | opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.zip opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.gz opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.bz2 opensim-SC_OLD-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL')
| -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(); |