diff options
| author | Melanie | 2011-11-04 01:18:37 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-04 01:18:37 +0000 |
| commit | 24235006f473cec56213705ce70df781cf9bcbc1 (patch) | |
| tree | 7d0e75978d48272827c3f03f087bf79658dd16cf /OpenSim/Services/Connectors | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Rename ForEachAvatar back to ForEachScenePresence. The other changes (diff) | |
| download | opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.zip opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.tar.gz opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.tar.bz2 opensim-SC-24235006f473cec56213705ce70df781cf9bcbc1.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
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 | } |