aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-11-23 00:31:09 +0100
committerMelanie2010-11-23 14:02:20 +0000
commit45b08a9ce306835dbd9493f4157a3a6e2e0d349c (patch)
tree0052fdaa2b48260839e6d6305cd82a4c470e3fb8
parentFix some crashes caused by the addition of the CreatorData column (diff)
downloadopensim-SC_OLD-45b08a9ce306835dbd9493f4157a3a6e2e0d349c.zip
opensim-SC_OLD-45b08a9ce306835dbd9493f4157a3a6e2e0d349c.tar.gz
opensim-SC_OLD-45b08a9ce306835dbd9493f4157a3a6e2e0d349c.tar.bz2
opensim-SC_OLD-45b08a9ce306835dbd9493f4157a3a6e2e0d349c.tar.xz
Fix more potential nullrefs
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs6
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();