Merge branch 'master' into bigmerge

2011-11-03 00:23:58 +00:00 · 2011-11-03 00:23:58 +00:00 · 457195466d
parent 26a4f32013 6b4ae4f30c
commit 457195466d
1 changed files with 1 additions and 1 deletions
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@ -473,7 +473,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                        // Grab the asset data from the response stream
                        using (MemoryStream stream = new MemoryStream())
                        {
-                            responseStream.CopyTo(stream);
+                            responseStream.CopyTo(stream, Int32.MaxValue);
                            asset.Data = stream.ToArray();
                        }
                    }