diff options
| author | Melanie | 2011-11-03 00:07:29 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-03 00:07:29 +0000 |
| commit | afde92d8cc4c7b4cfc2d33a0813e357266e80533 (patch) | |
| tree | 293f99668d784c6f764e875f612035d0ed78d19b | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-afde92d8cc4c7b4cfc2d33a0813e357266e80533.zip opensim-SC_OLD-afde92d8cc4c7b4cfc2d33a0813e357266e80533.tar.gz opensim-SC_OLD-afde92d8cc4c7b4cfc2d33a0813e357266e80533.tar.bz2 opensim-SC_OLD-afde92d8cc4c7b4cfc2d33a0813e357266e80533.tar.xz | |
Merge branch 'master' into bigmerge
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 30d3147..1771319 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
| @@ -473,7 +473,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 473 | // Grab the asset data from the response stream | 473 | // Grab the asset data from the response stream |
| 474 | using (MemoryStream stream = new MemoryStream()) | 474 | using (MemoryStream stream = new MemoryStream()) |
| 475 | { | 475 | { |
| 476 | responseStream.CopyTo(stream, Int32.MaxValue); | 476 | responseStream.CopyTo(stream); |
| 477 | asset.Data = stream.ToArray(); | 477 | asset.Data = stream.ToArray(); |
| 478 | } | 478 | } |
| 479 | } | 479 | } |