aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMic Bowman2011-11-02 18:55:54 -0700
committerMic Bowman2011-11-02 18:55:54 -0700
commit40a1eddfd173609923b0c8d24517b8ddb1a91bbd (patch)
treed0f2ccd7c8f105edc97753b74f8e9410a2d362ca /OpenSim
parentRevert "fix CopyTo call that was breaking under mono 2.10" (diff)
downloadopensim-SC_OLD-40a1eddfd173609923b0c8d24517b8ddb1a91bbd.zip
opensim-SC_OLD-40a1eddfd173609923b0c8d24517b8ddb1a91bbd.tar.gz
opensim-SC_OLD-40a1eddfd173609923b0c8d24517b8ddb1a91bbd.tar.bz2
opensim-SC_OLD-40a1eddfd173609923b0c8d24517b8ddb1a91bbd.tar.xz
Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size
not a target size. Mono 2.10 appears to try to allocate the full buffer which immediately crashes. Tested on mono 2.6.7 and 2.10.5
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs2
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 }