From 97eaae9d8454ade646dbd210bcf0cb521ec6b288 Mon Sep 17 00:00:00 2001
From: OpenSim Master
Date: Mon, 18 Jan 2010 15:50:33 -0800
Subject: * Fixed the Cable Beach inventory server to save the CreatorID as
well as properly handling null item names and descriptions * Fixed the MySQL
reader to safely handle null values in string columns that can be null
---
OpenSim/Data/MySQL/MySQLInventoryData.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index f566fde..4b71e39 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -345,8 +345,8 @@ namespace OpenSim.Data.MySQL
item.AssetID = new UUID((string) reader["assetID"]);
item.AssetType = (int) reader["assetType"];
item.Folder = new UUID((string) reader["parentFolderID"]);
- item.Name = (string) reader["inventoryName"];
- item.Description = (string) reader["inventoryDescription"];
+ item.Name = (string)(reader["inventoryName"] ?? String.Empty);
+ item.Description = (string)(reader["inventoryDescription"] ?? String.Empty);
item.NextPermissions = (uint) reader["inventoryNextPermissions"];
item.CurrentPermissions = (uint) reader["inventoryCurrentPermissions"];
item.InvType = (int) reader["invType"];
--
cgit v1.1