aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorRobert Adams2012-03-12 10:07:04 -0700
committerRobert Adams2012-03-12 10:07:04 -0700
commite0dd38f6722e891cfc91c8d795604b7b78c0bc81 (patch)
tree9e2b7f094df639c32ca0157944e78431c6982349 /OpenSim/Data
parentChange OpenSim.ini.example to reflect how to actually enable prim limits, (diff)
downloadopensim-SC-e0dd38f6722e891cfc91c8d795604b7b78c0bc81.zip
opensim-SC-e0dd38f6722e891cfc91c8d795604b7b78c0bc81.tar.gz
opensim-SC-e0dd38f6722e891cfc91c8d795604b7b78c0bc81.tar.bz2
opensim-SC-e0dd38f6722e891cfc91c8d795604b7b78c0bc81.tar.xz
Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().
.NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLXAssetData.cs2
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