diff options
| author | Melanie | 2009-10-02 08:23:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-02 08:23:38 +0100 |
| commit | 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch) | |
| tree | a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Data/MSSQL/MSSQLAssetData.cs | |
| parent | Restore the missing image handling to the image manager. The missing (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.xz | |
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLAssetData.cs')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLAssetData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index d193cf5..25f7cf0 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs | |||
| @@ -175,7 +175,7 @@ namespace OpenSim.Data.MSSQL | |||
| 175 | (@id, @name, @description, @assetType, @local, | 175 | (@id, @name, @description, @assetType, @local, |
| 176 | @temporary, @create_time, @access_time, @data)"; | 176 | @temporary, @create_time, @access_time, @data)"; |
| 177 | 177 | ||
| 178 | string assetName = asset.Name; | 178 | string assetName = asset.Name; |
| 179 | if (asset.Name.Length > 64) | 179 | if (asset.Name.Length > 64) |
| 180 | { | 180 | { |
| 181 | assetName = asset.Name.Substring(0, 64); | 181 | assetName = asset.Name.Substring(0, 64); |
| @@ -223,7 +223,7 @@ namespace OpenSim.Data.MSSQL | |||
| 223 | local = @local, temporary = @temporary, data = @data | 223 | local = @local, temporary = @temporary, data = @data |
| 224 | WHERE id = @keyId;"; | 224 | WHERE id = @keyId;"; |
| 225 | 225 | ||
| 226 | string assetName = asset.Name; | 226 | string assetName = asset.Name; |
| 227 | if (asset.Name.Length > 64) | 227 | if (asset.Name.Length > 64) |
| 228 | { | 228 | { |
| 229 | assetName = asset.Name.Substring(0, 64); | 229 | assetName = asset.Name.Substring(0, 64); |