aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorDiva Canto2010-06-29 06:37:39 -0700
committerDiva Canto2010-06-29 06:37:39 -0700
commit1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch)
tree09f953b9b6150ea29153917b2c159fa621a1cf66 /OpenSim/Data/MySQL
parentdon't report the null uuid as a missing asset on saving oars/iars (diff)
parentThis file wants to be committed. (diff)
downloadopensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip
opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz
opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2
opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz
Merge branch 'master' into 0.7-post-fixes
Conflicts: OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLXInventoryData.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
index 0fe801d..3c73095 100644
--- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -64,14 +64,22 @@ namespace OpenSim.Data.MySQL
64 64
65 public bool StoreFolder(XInventoryFolder folder) 65 public bool StoreFolder(XInventoryFolder folder)
66 { 66 {
67 if (folder.folderName.Length > 64)
68 folder.folderName = folder.folderName.Substring(0, 64);
69
67 return m_Folders.Store(folder); 70 return m_Folders.Store(folder);
68 } 71 }
69 72
70 public bool StoreItem(XInventoryItem item) 73 public bool StoreItem(XInventoryItem item)
71 { 74 {
75 if (item.inventoryName.Length > 64)
76 item.inventoryName = item.inventoryName.Substring(0, 64);
77 if (item.inventoryDescription.Length > 128)
78 item.inventoryDescription = item.inventoryDescription.Substring(0, 128);
79
72 return m_Items.Store(item); 80 return m_Items.Store(item);
73 } 81 }
74 82
75 public bool DeleteFolders(string field, string val) 83 public bool DeleteFolders(string field, string val)
76 { 84 {
77 return m_Folders.Delete(field, val); 85 return m_Folders.Delete(field, val);