aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLInventoryData.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index e9b10f3..382d4a5 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -288,7 +288,7 @@ namespace OpenSim.Data.MySQL
288 // TODO: this is to handle a case where NULLs creep in there, which we are not sure is endemic to the system, or legacy. It would be nice to live fix these. 288 // TODO: this is to handle a case where NULLs creep in there, which we are not sure is endemic to the system, or legacy. It would be nice to live fix these.
289 // (DBGuid.FromDB() reads db NULLs as well, returns UUID.Zero) 289 // (DBGuid.FromDB() reads db NULLs as well, returns UUID.Zero)
290 item.CreatorId = reader["creatorID"].ToString(); 290 item.CreatorId = reader["creatorID"].ToString();
291 291
292 // Be a bit safer in parsing these because the 292 // Be a bit safer in parsing these because the
293 // database doesn't enforce them to be not null, and 293 // database doesn't enforce them to be not null, and
294 // the inventory still works if these are weird in the 294 // the inventory still works if these are weird in the
@@ -453,7 +453,7 @@ namespace OpenSim.Data.MySQL
453 itemName = item.Name.Substring(0, 64); 453 itemName = item.Name.Substring(0, 64);
454 m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length + " to " + itemName.Length + " characters on add item"); 454 m_log.Warn("[INVENTORY DB]: Name field truncated from " + item.Name.Length + " to " + itemName.Length + " characters on add item");
455 } 455 }
456 456
457 string itemDesc = item.Description; 457 string itemDesc = item.Description;
458 if (item.Description.Length > 128) 458 if (item.Description.Length > 128)
459 { 459 {
@@ -490,10 +490,10 @@ namespace OpenSim.Data.MySQL
490 result.Parameters.AddWithValue("?groupID", item.GroupID); 490 result.Parameters.AddWithValue("?groupID", item.GroupID);
491 result.Parameters.AddWithValue("?groupOwned", item.GroupOwned); 491 result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
492 result.Parameters.AddWithValue("?flags", item.Flags); 492 result.Parameters.AddWithValue("?flags", item.Flags);
493 493
494 lock (m_dbLock) 494 lock (m_dbLock)
495 result.ExecuteNonQuery(); 495 result.ExecuteNonQuery();
496 496
497 result.Dispose(); 497 result.Dispose();
498 } 498 }
499 499
@@ -630,7 +630,7 @@ namespace OpenSim.Data.MySQL
630 { 630 {
631 cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString()); 631 cmd.Parameters.AddWithValue("?folderID", folder.ID.ToString());
632 cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString()); 632 cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
633 633
634 try 634 try
635 { 635 {
636 lock (m_dbLock) 636 lock (m_dbLock)
@@ -860,7 +860,7 @@ namespace OpenSim.Data.MySQL
860 deleteOneFolder(folderID); 860 deleteOneFolder(folderID);
861 deleteItemsInFolder(folderID); 861 deleteItemsInFolder(folderID);
862 } 862 }
863 863
864 public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) 864 public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
865 { 865 {
866 lock (m_dbLock) 866 lock (m_dbLock)