diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLManager.cs | 2 |
2 files changed, 3 insertions, 3 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"]; |
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index a6cce57..243394e 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs | |||
@@ -778,7 +778,7 @@ namespace OpenSim.Data.MySQL | |||
778 | string aboutText, string firstText, | 778 | string aboutText, string firstText, |
779 | UUID profileImage, UUID firstImage, UUID webLoginKey, int userFlags, int godLevel, string customType, UUID partner) | 779 | UUID profileImage, UUID firstImage, UUID webLoginKey, int userFlags, int godLevel, string customType, UUID partner) |
780 | { | 780 | { |
781 | m_log.Debug("[MySQLManager]: Fetching profile for " + uuid.ToString()); | 781 | m_log.Debug("[MySQLManager]: Creating profile for \"" + username + " " + lastname + "\" (" + uuid + ")"); |
782 | string sql = | 782 | string sql = |
783 | "INSERT INTO users (`UUID`, `username`, `lastname`, `email`, `passwordHash`, `passwordSalt`, `homeRegion`, `homeRegionID`, "; | 783 | "INSERT INTO users (`UUID`, `username`, `lastname`, `email`, `passwordHash`, `passwordSalt`, `homeRegion`, `homeRegionID`, "; |
784 | sql += | 784 | sql += |