diff options
| author | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
| commit | bc51dfc45eb73e34d91fd72d0a537ffc907a9da6 (patch) | |
| tree | 084062cd82e16edbff08a5e3b705458d915caf86 /OpenSim/Server | |
| parent | Merge branch 'master-core' into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.zip opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.gz opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.bz2 opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.xz | |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index 23ae5b4..22a718a 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
| @@ -600,8 +600,10 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 600 | ret["AssetType"] = item.AssetType.ToString(); | 600 | ret["AssetType"] = item.AssetType.ToString(); |
| 601 | ret["BasePermissions"] = item.BasePermissions.ToString(); | 601 | ret["BasePermissions"] = item.BasePermissions.ToString(); |
| 602 | ret["CreationDate"] = item.CreationDate.ToString(); | 602 | ret["CreationDate"] = item.CreationDate.ToString(); |
| 603 | ret["CreatorId"] = item.CreatorId.ToString(); | 603 | if (item.CreatorId != null) |
| 604 | ret["CreatorData"] = item.CreatorData.ToString(); | 604 | ret["CreatorId"] = item.CreatorId.ToString(); |
| 605 | else | ||
| 606 | ret["CreatorId"] = String.Empty; | ||
| 605 | ret["CurrentPermissions"] = item.CurrentPermissions.ToString(); | 607 | ret["CurrentPermissions"] = item.CurrentPermissions.ToString(); |
| 606 | ret["Description"] = item.Description.ToString(); | 608 | ret["Description"] = item.Description.ToString(); |
| 607 | ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString(); | 609 | ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString(); |