Merge branch 'master-core' into mantis5110

This commit is contained in:
Jonathan Freedman
2010-11-23 22:27:54 -08:00
17 changed files with 307 additions and 99 deletions

View File

@@ -600,8 +600,10 @@ namespace OpenSim.Server.Handlers.Asset
ret["AssetType"] = item.AssetType.ToString();
ret["BasePermissions"] = item.BasePermissions.ToString();
ret["CreationDate"] = item.CreationDate.ToString();
ret["CreatorId"] = item.CreatorId.ToString();
ret["CreatorData"] = item.CreatorData.ToString();
if (item.CreatorId != null)
ret["CreatorId"] = item.CreatorId.ToString();
else
ret["CreatorId"] = String.Empty;
ret["CurrentPermissions"] = item.CurrentPermissions.ToString();
ret["Description"] = item.Description.ToString();
ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString();