diff options
author | Melanie | 2010-06-27 20:05:29 +0100 |
---|---|---|
committer | Melanie | 2010-06-27 20:05:29 +0100 |
commit | 121ba7e95c35806f08cdc4f0eee6e57b4ea7458f (patch) | |
tree | 2eb0b6250804d019d83a26e7576a538a1ef35c81 /OpenSim/Data/SQLite/SQLiteXInventoryData.cs | |
parent | Fix permission propagation to prevent permanently locked objects from being (diff) | |
parent | Same patch as before but for SQLite. (diff) | |
download | opensim-SC_OLD-121ba7e95c35806f08cdc4f0eee6e57b4ea7458f.zip opensim-SC_OLD-121ba7e95c35806f08cdc4f0eee6e57b4ea7458f.tar.gz opensim-SC_OLD-121ba7e95c35806f08cdc4f0eee6e57b4ea7458f.tar.bz2 opensim-SC_OLD-121ba7e95c35806f08cdc4f0eee6e57b4ea7458f.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteXInventoryData.cs')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteXInventoryData.cs | 8 |
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 | ||