diff options
| author | Diva Canto | 2012-03-13 08:07:11 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-13 08:07:11 -0700 |
| commit | 37828c9b9a065e5ee4df06e05eecd1e0a41ea07e (patch) | |
| tree | fbcc970ef6fa4256e98edf71d1ce4dc9c621440c /OpenSim/Data | |
| parent | Datasnapshot: added "secret" to the registration/deregistration query so that... (diff) | |
| parent | Add max thread and min thread information to "xengine status" region console ... (diff) | |
| download | opensim-SC-37828c9b9a065e5ee4df06e05eecd1e0a41ea07e.zip opensim-SC-37828c9b9a065e5ee4df06e05eecd1e0a41ea07e.tar.gz opensim-SC-37828c9b9a065e5ee4df06e05eecd1e0a41ea07e.tar.bz2 opensim-SC-37828c9b9a065e5ee4df06e05eecd1e0a41ea07e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLXAssetData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs index 95ef72a..06fe55a 100644 --- a/OpenSim/Data/MySQL/MySQLXAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs | |||
| @@ -162,7 +162,7 @@ namespace OpenSim.Data.MySQL | |||
| 162 | using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress)) | 162 | using (GZipStream decompressionStream = new GZipStream(new MemoryStream(asset.Data), CompressionMode.Decompress)) |
| 163 | { | 163 | { |
| 164 | MemoryStream outputStream = new MemoryStream(); | 164 | MemoryStream outputStream = new MemoryStream(); |
| 165 | WebUtil.CopyTo(decompressionStream, outputStream, int.MaxValue); | 165 | WebUtil.CopyStream(decompressionStream, outputStream, int.MaxValue); |
| 166 | // int compressedLength = asset.Data.Length; | 166 | // int compressedLength = asset.Data.Length; |
| 167 | asset.Data = outputStream.ToArray(); | 167 | asset.Data = outputStream.ToArray(); |
| 168 | 168 | ||