aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorOpenSim Master2010-01-18 15:50:33 -0800
committerMelanie2010-02-06 01:12:36 +0000
commit97eaae9d8454ade646dbd210bcf0cb521ec6b288 (patch)
tree5b36c8f832505b4ea18dea190b88f559f8aee06e /OpenSim/Data
parentRevert "change position of OnAttach event firing so that this also happens wh... (diff)
downloadopensim-SC_OLD-97eaae9d8454ade646dbd210bcf0cb521ec6b288.zip
opensim-SC_OLD-97eaae9d8454ade646dbd210bcf0cb521ec6b288.tar.gz
opensim-SC_OLD-97eaae9d8454ade646dbd210bcf0cb521ec6b288.tar.bz2
opensim-SC_OLD-97eaae9d8454ade646dbd210bcf0cb521ec6b288.tar.xz
* 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
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs4
1 files changed, 2 insertions, 2 deletions
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
345 item.AssetID = new UUID((string) reader["assetID"]); 345 item.AssetID = new UUID((string) reader["assetID"]);
346 item.AssetType = (int) reader["assetType"]; 346 item.AssetType = (int) reader["assetType"];
347 item.Folder = new UUID((string) reader["parentFolderID"]); 347 item.Folder = new UUID((string) reader["parentFolderID"]);
348 item.Name = (string) reader["inventoryName"]; 348 item.Name = (string)(reader["inventoryName"] ?? String.Empty);
349 item.Description = (string) reader["inventoryDescription"]; 349 item.Description = (string)(reader["inventoryDescription"] ?? String.Empty);
350 item.NextPermissions = (uint) reader["inventoryNextPermissions"]; 350 item.NextPermissions = (uint) reader["inventoryNextPermissions"];
351 item.CurrentPermissions = (uint) reader["inventoryCurrentPermissions"]; 351 item.CurrentPermissions = (uint) reader["inventoryCurrentPermissions"];
352 item.InvType = (int) reader["invType"]; 352 item.InvType = (int) reader["invType"];