aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorMelanie2011-11-03 00:23:58 +0000
committerMelanie2011-11-03 00:23:58 +0000
commit457195466d00cf5f84c20b5f6d71f7d8b07dbec8 (patch)
treeeb9f955bac7df379cd7a4b7ae0fce877aade56fe /OpenSim/Services/Connectors
parentMerge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge (diff)
parentRevert "fix CopyTo call that was breaking under mono 2.10" (diff)
downloadopensim-SC_OLD-457195466d00cf5f84c20b5f6d71f7d8b07dbec8.zip
opensim-SC_OLD-457195466d00cf5f84c20b5f6d71f7d8b07dbec8.tar.gz
opensim-SC_OLD-457195466d00cf5f84c20b5f6d71f7d8b07dbec8.tar.bz2
opensim-SC_OLD-457195466d00cf5f84c20b5f6d71f7d8b07dbec8.tar.xz
Merge branch 'master' into bigmerge
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 }