diff options
| author | Melanie | 2012-03-14 11:33:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-14 11:33:51 +0000 |
| commit | c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d (patch) | |
| tree | 4b2972bdee4a29c4ecfce11bee9f154c7cdd9873 /OpenSim/Data | |
| parent | Implement llSetPrimitiveParams for physics shape and material. Add (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.zip opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.gz opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.bz2 opensim-SC_OLD-c0f70d17fcd93751a8849f7ad1c5a76e5a3d135d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Data')
| -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 692ade7..7b634e2 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 | ||