Merge branch 'master' into bigmerge

This commit is contained in:
Melanie
2011-11-03 00:23:58 +00:00

View File

@@ -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();
}
}