diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLXAssetData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Data/PGSQL/PGSQLAssetData.cs | 10 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 10 |
4 files changed, 23 insertions, 15 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 1488e1a..83e7e4c 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -170,6 +170,14 @@ namespace OpenSim.Data.MySQL | |||
170 | } | 170 | } |
171 | 171 | ||
172 | string assetDescription = asset.Description; | 172 | string assetDescription = asset.Description; |
173 | if(assetDescription.Length > AssetBase.MAX_LMASSET_DESC) | ||
174 | { | ||
175 | if(asset.Type == (sbyte) AssetType.Landmark) | ||
176 | assetDescription = assetDescription.Substring(0, AssetBase.MAX_LMASSET_DESC); | ||
177 | else | ||
178 | assetDescription = assetDescription.Substring(0, AssetBase.MAX_ASSET_DESC); | ||
179 | } | ||
180 | |||
173 | if (asset.Description.Length > AssetBase.MAX_ASSET_DESC) | 181 | if (asset.Description.Length > AssetBase.MAX_ASSET_DESC) |
174 | { | 182 | { |
175 | assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC); | 183 | assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC); |
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index ec2bcc6..6c6f560 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs | |||
@@ -214,12 +214,12 @@ namespace OpenSim.Data.MySQL | |||
214 | } | 214 | } |
215 | 215 | ||
216 | string assetDescription = asset.Description; | 216 | string assetDescription = asset.Description; |
217 | if (asset.Description.Length > AssetBase.MAX_ASSET_DESC) | 217 | if(assetDescription.Length > AssetBase.MAX_LMASSET_DESC) |
218 | { | 218 | { |
219 | assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC); | 219 | if(asset.Type == (sbyte) AssetType.Landmark) |
220 | m_log.WarnFormat( | 220 | assetDescription = assetDescription.Substring(0, AssetBase.MAX_LMASSET_DESC); |
221 | "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", | 221 | else |
222 | asset.Description, asset.ID, asset.Description.Length, assetDescription.Length); | 222 | assetDescription = assetDescription.Substring(0, AssetBase.MAX_ASSET_DESC); |
223 | } | 223 | } |
224 | 224 | ||
225 | if (m_enableCompression) | 225 | if (m_enableCompression) |
diff --git a/OpenSim/Data/PGSQL/PGSQLAssetData.cs b/OpenSim/Data/PGSQL/PGSQLAssetData.cs index 81adb03..97ea6a4 100644 --- a/OpenSim/Data/PGSQL/PGSQLAssetData.cs +++ b/OpenSim/Data/PGSQL/PGSQLAssetData.cs | |||
@@ -175,12 +175,12 @@ namespace OpenSim.Data.PGSQL | |||
175 | } | 175 | } |
176 | 176 | ||
177 | string assetDescription = asset.Description; | 177 | string assetDescription = asset.Description; |
178 | if (asset.Description.Length > AssetBase.MAX_ASSET_DESC) | 178 | if(assetDescription.Length > AssetBase.MAX_LMASSET_DESC) |
179 | { | 179 | { |
180 | assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC); | 180 | if(asset.Type == (sbyte) AssetType.Landmark) |
181 | m_log.WarnFormat( | 181 | assetDescription = assetDescription.Substring(0, AssetBase.MAX_LMASSET_DESC); |
182 | "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", | 182 | else |
183 | asset.Description, asset.ID, asset.Description.Length, assetDescription.Length); | 183 | assetDescription = assetDescription.Substring(0, AssetBase.MAX_ASSET_DESC); |
184 | } | 184 | } |
185 | 185 | ||
186 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) | 186 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 9c2bd2e..9fbd9c7 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -143,12 +143,12 @@ namespace OpenSim.Data.SQLite | |||
143 | } | 143 | } |
144 | 144 | ||
145 | string assetDescription = asset.Description; | 145 | string assetDescription = asset.Description; |
146 | if (asset.Description.Length > AssetBase.MAX_ASSET_DESC) | 146 | if(assetDescription.Length > AssetBase.MAX_LMASSET_DESC) |
147 | { | 147 | { |
148 | assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC); | 148 | if(asset.Type == (sbyte) AssetType.Landmark) |
149 | m_log.WarnFormat( | 149 | assetDescription = assetDescription.Substring(0, AssetBase.MAX_LMASSET_DESC); |
150 | "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", | 150 | else |
151 | asset.Description, asset.ID, asset.Description.Length, assetDescription.Length); | 151 | assetDescription = assetDescription.Substring(0, AssetBase.MAX_ASSET_DESC); |
152 | } | 152 | } |
153 | 153 | ||
154 | //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString()); | 154 | //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString()); |