diff options
| author | OpenSim Master | 2010-01-18 15:50:33 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-02-05 18:05:57 -0800 |
| commit | 3e697ad57e8f26e50e13b88fff059855ed17e660 (patch) | |
| tree | a657c4bf58cb54affc57163d2576678bd3fc0bea /OpenSim/Data/MySQL | |
| parent | Revert "Old OpenSim installations may have no AssetCaching setting in config-... (diff) | |
| download | opensim-SC_OLD-3e697ad57e8f26e50e13b88fff059855ed17e660.zip opensim-SC_OLD-3e697ad57e8f26e50e13b88fff059855ed17e660.tar.gz opensim-SC_OLD-3e697ad57e8f26e50e13b88fff059855ed17e660.tar.bz2 opensim-SC_OLD-3e697ad57e8f26e50e13b88fff059855ed17e660.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 '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 4 |
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"]; |