diff options
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLXAssetData.cs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs index 6e88489..1798d20 100644 --- a/OpenSim/Data/PGSQL/PGSQLXAssetData.cs +++ b/OpenSim/Data/PGSQL/PGSQLXAssetData.cs | |||
| @@ -173,16 +173,18 @@ namespace OpenSim.Data.PGSQL | |||
| 173 | 173 | ||
| 174 | if (m_enableCompression) | 174 | if (m_enableCompression) |
| 175 | { | 175 | { |
| 176 | using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress)) | 176 | using(MemoryStream ms = new MemoryStream(asset.Data)) |
| 177 | using(GZipStream decompressionStream = new GZipStream(ms, CompressionMode.Decompress)) | ||
| 177 | { | 178 | { |
| 178 | MemoryStream outputStream = new MemoryStream(); | 179 | using(MemoryStream outputStream = new MemoryStream()) |
| 179 | WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue); | 180 | { |
| 180 | // int compressedLength = asset.Data.Length; | 181 | decompressionStream.CopyTo(outputStream,int.MaxValue); |
| 181 | asset.Data = outputStream.ToArray(); | 182 | // int compressedLength = asset.Data.Length; |
| 182 | 183 | asset.Data = outputStream.ToArray(); | |
| 183 | // m_log.DebugFormat( | 184 | } |
| 184 | // "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}", | 185 | // m_log.DebugFormat( |
| 185 | // asset.ID, asset.Name, asset.Data.Length, compressedLength); | 186 | // "[XASSET DB]: Decompressed {0} {1} to {2} bytes from {3}", |
| 187 | // asset.ID, asset.Name, asset.Data.Length, compressedLength); | ||
| 186 | } | 188 | } |
| 187 | } | 189 | } |
| 188 | 190 | ||