diff options
| author | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
| commit | a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec (patch) | |
| tree | f26aa58d3a31ea6460a9cb76cc70a2ccb34945cc /OpenSim/Services/Connectors | |
| parent | Change default say distance to 20m from 30m, the same as on the big grid. Th... (diff) | |
| parent | Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size (diff) | |
| download | opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.zip opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.gz opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.bz2 opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors')
| -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..d8089ac 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, 4096); |
| 477 | asset.Data = stream.ToArray(); | 477 | asset.Data = stream.ToArray(); |
| 478 | } | 478 | } |
| 479 | } | 479 | } |