aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
diff options
context:
space:
mode:
authorMelanie2010-06-27 20:05:55 +0100
committerMelanie2010-06-27 20:05:55 +0100
commitba38c697e8ae18df8a2facb89ace550dfc7390a7 (patch)
treecad542e159968f53fd872d72aaaa01a4374ec35b /OpenSim/Data/SQLite/SQLiteXInventoryData.cs
parentDeal with incoming land objects properly so they don't just stack up (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-ba38c697e8ae18df8a2facb89ace550dfc7390a7.zip
opensim-SC-ba38c697e8ae18df8a2facb89ace550dfc7390a7.tar.gz
opensim-SC-ba38c697e8ae18df8a2facb89ace550dfc7390a7.tar.bz2
opensim-SC-ba38c697e8ae18df8a2facb89ace550dfc7390a7.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteXInventoryData.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index 6064538..ca651e1 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -66,11 +66,19 @@ namespace OpenSim.Data.SQLite
66 66
67 public bool StoreFolder(XInventoryFolder folder) 67 public bool StoreFolder(XInventoryFolder folder)
68 { 68 {
69 if (folder.folderName.Length > 64)
70 folder.folderName = folder.folderName.Substring(0, 64);
71
69 return m_Folders.Store(folder); 72 return m_Folders.Store(folder);
70 } 73 }
71 74
72 public bool StoreItem(XInventoryItem item) 75 public bool StoreItem(XInventoryItem item)
73 { 76 {
77 if (item.inventoryName.Length > 64)
78 item.inventoryName = item.inventoryName.Substring(0, 64);
79 if (item.inventoryDescription.Length > 128)
80 item.inventoryDescription = item.inventoryDescription.Substring(0, 128);
81
74 return m_Items.Store(item); 82 return m_Items.Store(item);
75 } 83 }
76 84