ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 05:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-04-29 23:33:26 +01:00
parent f06772a088 6a4fae123a
commit 08ebcdb0b8
18 changed files with 884 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/MySQL/MySQLInventoryData.cs
View File

@@ -145,7 +145,7 @@ namespace OpenSim.Data.MySQL
/// <summary>
/// Returns a list of the root folders within a users inventory
/// </summary>
/// <param name="user">The user whos inventory is to be searched</param>
/// <param name="user">The user whose inventory is to be searched</param>
/// <returns>A list of folder objects</returns>
public List<InventoryFolderBase> getUserRootFolders(UUID user)
{
@@ -284,7 +284,7 @@ namespace OpenSim.Data.MySQL
{
InventoryItemBase item = new InventoryItemBase();
// 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.
// 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.
if (reader["creatorID"] == null)
{
item.CreatorId = UUID.Zero.ToString();