aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorMelanie2011-11-03 00:23:32 +0000
committerMelanie2011-11-03 00:23:32 +0000
commit6b4ae4f30c2091f5f6fa99dfc904cfdd42a266ea (patch)
tree3eb405e222426a8d51dd9274275673ef34780a48 /OpenSim/Services/Connectors
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-6b4ae4f30c2091f5f6fa99dfc904cfdd42a266ea.zip
opensim-SC_OLD-6b4ae4f30c2091f5f6fa99dfc904cfdd42a266ea.tar.gz
opensim-SC_OLD-6b4ae4f30c2091f5f6fa99dfc904cfdd42a266ea.tar.bz2
opensim-SC_OLD-6b4ae4f30c2091f5f6fa99dfc904cfdd42a266ea.tar.xz
Revert "fix CopyTo call that was breaking under mono 2.10"
This reverts commit d30971fdc243886b8fc614c7f869530db87e10f2.
Diffstat (limited to 'OpenSim/Services/Connectors')
-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 1771319..30d3147 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); 476 responseStream.CopyTo(stream, Int32.MaxValue);
477 asset.Data = stream.ToArray(); 477 asset.Data = stream.ToArray();
478 } 478 }
479 } 479 }